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

[David Chinner <dgc@sgi.com>]

On Thu, Nov 15, 2007 at 11:54:04AM +1100, Timothy Shimmin wrote:
> David Chinner wrote:
> > On Wed, Nov 14, 2007 at 01:46:52PM +1100, Timothy Shimmin wrote:
> >> David Chinner wrote:
> >>> Just replace them with (val & PAGE_CACHE_MASK)
> >                                   ^^^^^^^^^^^^^^^
> > ......
> >> --- a/fs/xfs/linux-2.6/xfs_lrw.c	2007-11-14 13:02:46.000000000 +1100
> >> +++ b/fs/xfs/linux-2.6/xfs_lrw.c	2007-11-14 12:36:59.920080014 +1100
> >> @@ -254,9 +254,8 @@ xfs_read(
> >>
> >>   	if (unlikely(ioflags & IO_ISDIRECT)) {
> >>   		if (VN_CACHED(vp))
> >> -			ret = xfs_flushinval_pages(ip,
> >> -					ctooff(offtoct(*offset)),
> >> -					-1, FI_REMAPF_LOCKED);
> >> +			ret = xfs_flushinval_pages(ip, (*offset & PAGE_MASK),
> >                                                                   ^^^^^^^^^
> > 
> > s/PAGE_MASK/PAGE_CACHE_MASK/g
> > 
> 
> Okay.
> 
> While here, looking at a few others...
> 
> I'll get rid of BPCSHIFT.
> 
> And then...
> 
> #define NBPP            PAGE_SIZE
> #define NDPP            (1 << (PAGE_SHIFT - 9)) <--- not used - another to nuke
> #define NBPC            PAGE_SIZE <----- used once
> 
> grep -Ir 'NBPC' . | egrep -v 'tag|anot|diff'
> ./linux-2.6/xfs_linux.h:#define NBPC            PAGE_SIZE       /* Number of bytes per click */
> ./xfs_itable.c: irbuf = kmem_zalloc_greedy(&irbsize, NBPC, NBPC * 4,
> 
>  > grep -Ir 'NBPP' . | egrep -v 'tag|anot|diff|NBPPR'
> ./linux-2.6/xfs_linux.h:#define NBPP            PAGE_SIZE
> ./quota/xfs_qm.h:#define XFS_QM_HASHSIZE_LOW            (NBPP / sizeof(xfs_dqhash_t))
> ./quota/xfs_qm.h:#define XFS_QM_HASHSIZE_HIGH           ((NBPP * 4) / sizeof(xfs_dqhash_t))

PAGE_SIZE

> ./xfs_bmap.c:   } else if (mp->m_sb.sb_blocksize >= NBPP) {
> ./xfs_bmap.c:           args.prod = NBPP >> mp->m_sb.sb_blocklog;

PAGE_CACHE_SIZE

> ./xfs_itable.c: bcount = MIN(left, (int)(NBPP / sizeof(*buffer)));

PAGE_SIZE

> ./xfs_log.c:                    kmem_free(tic, NBPP);
> ./xfs_log.c:    uint            i = (NBPP / sizeof(xlog_ticket_t)) - 2;
> ./xfs_log.c:    buf = (xfs_caddr_t) kmem_zalloc(NBPP, KM_SLEEP);

We should replace that hand rolled ticket allocator with a slab cache.

> ./xfs_vnodeops.c:       rounding = max_t(uint, 1 << mp->m_sb.sb_blocklog, NBPP);

PAGE_CACHE_SIZE. (as suggested ;)

> Might as well get rid of NBPC and replace by NBPP.
> 
> Is it just worth s/NBPC/PAGE_SIZE/g ?

yup.

Cheers,

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