On Mon 19-01-15 01:07:20, Christoph Hellwig wrote:
> > 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.
I have moved the definitions because Dave asked me to use them in the XFS
parts of quota code (maybe he didn't realize that to be able to use them I
have to move the definitions somewhere where quota code can include them).
Dave? I personally don't care which variant will get used...
> Otherwise looks good:
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR