On Fri, Jul 11, 2014 at 08:33:53AM -0400, Brian Foster wrote: > On Fri, Jul 11, 2014 at 09:26:18AM +1000, Dave Chinner wrote: > > From: Dave Chinner <dchinner@xxxxxxxxxx> > > > ... > > > > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> > > --- > > fs/xfs/xfs_bmap.c | 4 +-- > > fs/xfs/xfs_bmap_util.c | 43 -------------------------- > > fs/xfs/xfs_bmap_util.h | 15 +++++---- > > fs/xfs/xfs_btree.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++-- > > 4 files changed, 91 insertions(+), 55 deletions(-) > > > ... > > diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h > > index 935ed2b..91df8e9 100644 > > --- a/fs/xfs/xfs_bmap_util.h > > +++ b/fs/xfs/xfs_bmap_util.h > > @@ -50,12 +50,13 @@ struct xfs_bmalloca { > > xfs_extlen_t total; /* total blocks needed for xaction */ > > xfs_extlen_t minlen; /* minimum allocation size (blocks) */ > > xfs_extlen_t minleft; /* amount must be left after alloc */ > > - char eof; /* set if allocating past last extent */ > > - char wasdel; /* replacing a delayed allocation */ > > - char userdata;/* set if is user data */ > > - char aeof; /* allocated space at eof */ > > - char conv; /* overwriting unwritten extents */ > > - char stack_switch; > > + bool eof; /* set if allocating past last extent */ > > + bool wasdel; /* replacing a delayed allocation */ > > + bool userdata;/* set if is user data */ > > + bool aeof; /* allocated space at eof */ > > + bool conv; /* overwriting unwritten extents */ > > + bool stack_switch; > > + bool kswapd; /* work being done for kswapd */ > > Neither stack_switch nor kswapd are used any longer. Removal of > stack_switch means that the XFS_BMAPI_STACK_SWITCH flag can go away as > well. Yup, I'll fix that. > > -STATIC int /* error */ > > -xfs_btree_split( > > +int /* error */ > > +__xfs_btree_split( > > Looks like this can remain static. The rest looks Ok to me, but I'll run > some tests too. I'll fix that too. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs