xfs-masters
[Top] [All Lists]

[xfs-masters] Re: [PATCH] fs/xfs: remove duplicated defines

To: xfs-masters@xxxxxxxxxxx
Subject: [xfs-masters] Re: [PATCH] fs/xfs: remove duplicated defines
From: David Chinner <dgc@xxxxxxx>
Date: Mon, 12 Nov 2007 13:04:45 +1100
Cc: Eric Sandeen <sandeen@xxxxxxxxxxx>, xfs@xxxxxxxxxxx, kernel-janitors@xxxxxxxxxxxxxxx
In-reply-to: <47379F5A.20107@sgi.com>
References: <20071111134351.106efb98@lucky.kitzblitz> <473796EF.6050104@sandeen.net> <473799A9.9000200@sgi.com> <47379E42.2030006@sgi.com> <47379F5A.20107@sgi.com>
Reply-to: xfs-masters@xxxxxxxxxxx
Sender: xfs-masters-bounce@xxxxxxxxxxx
User-agent: Mutt/1.4.2.1i
On Mon, Nov 12, 2007 at 11:33:30AM +1100, Timothy Shimmin wrote:
> Where the attachment was supposed to look like...
> 
> ===========================================================================
> Index: fs/xfs/linux-2.6/xfs_linux.h
> ===========================================================================
> 
> --- a/fs/xfs/linux-2.6/xfs_linux.h    2007-11-12 11:24:05.000000000 +1100
> +++ b/fs/xfs/linux-2.6/xfs_linux.h    2007-11-12 11:14:22.818831666 +1100
> @@ -159,12 +159,6 @@
>   /* number of BB's per block device block */
>   #define     BLKDEV_BB               BTOBB(BLKDEV_IOSIZE)
> 
> -/* bytes to clicks */
> -#define      btoc(x)         (((__psunsigned_t)(x)+(NBPC-1))>>BPCSHIFT)
> -#define      btoct(x)        ((__psunsigned_t)(x)>>BPCSHIFT)
> -#define      btoc64(x)       (((__uint64_t)(x)+(NBPC-1))>>BPCSHIFT)
> -#define      btoct64(x)      ((__uint64_t)(x)>>BPCSHIFT)
> -
>   /* off_t bytes to clicks */
>   #define offtoc(x)       (((__uint64_t)(x)+(NBPC-1))>>BPCSHIFT)
>   #define offtoct(x)      ((xfs_off_t)(x)>>BPCSHIFT)
> @@ -172,14 +166,6 @@
>   /* clicks to off_t bytes */
>   #define     ctooff(x)       ((xfs_off_t)(x)<<BPCSHIFT)
> 
> -/* clicks to bytes */
> -#define      ctob(x)         ((__psunsigned_t)(x)<<BPCSHIFT)
> -#define btoct(x)        ((__psunsigned_t)(x)>>BPCSHIFT)
> -#define      ctob64(x)       ((__uint64_t)(x)<<BPCSHIFT)
> -
> -/* bytes to clicks */
> -#define btoc(x)         (((__psunsigned_t)(x)+(NBPC-1))>>BPCSHIFT)
> -
>   #define ENOATTR             ENODATA         /* Attribute not found */
>   #define EWRONGFS    EINVAL          /* Mount with wrong filesystem type */
>   #define EFSCORRUPTED        EUCLEAN         /* Filesystem is corrupted */

Perhaps we should look at cleaning up the cusers of offtoc, offtoct, etc
and killing BPCSHIFT altogether....

Cheers,

Dave.
-- 
Dave Chinner
Principal Engineer
SGI Australian Software Group


<Prev in Thread] Current Thread [Next in Thread>