> diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h > index 18dc721ca19f..f718ba1f2ccb 100644 > --- a/fs/xfs/libxfs/xfs_fs.h > +++ b/fs/xfs/libxfs/xfs_fs.h > @@ -559,18 +559,4 @@ typedef struct xfs_swapext > /* XFS_IOC_GETFSUUID ---------- deprecated 140 */ > > > -#ifndef HAVE_BBMACROS > -/* > - * Block I/O parameterization. A basic block (BB) is the lowest size of > - * filesystem allocation, and must equal 512. Length units given to bio > - * routines are in BB's. > - */ > -#define BBSHIFT 9 > -#define BBSIZE (1<<BBSHIFT) > -#define BBMASK (BBSIZE-1) > -#define BTOBB(bytes) (((__u64)(bytes) + BBSIZE - 1) >> BBSHIFT) > -#define BTOBBT(bytes) ((__u64)(bytes) >> BBSHIFT) > -#define BBTOB(bbs) ((bbs) << BBSHIFT) > -#endif Please don't move these defintions around and just opencode them in the quota code. Otherwise looks good: Reviewed-by: Christoph Hellwig <hch@xxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html