On Tue, Aug 21, 2018 at 09:25:35AM -0400, Brian Foster wrote: > On Mon, Aug 20, 2018 at 02:48:49PM +1000, Dave Chinner wrote: > > From: Dave Chinner <dchinner@xxxxxxxxxx> > > > > The superblock verifiers are one of the last places that use the sb > > version functions to do feature checks. This are all quite simple > > uses, and there aren't many of them so open code them all. > > > > Also, move the good version number check into xfs_sb.c instead of it > > being an inline function in xfs_format.h > > > > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> > > --- > > fs/xfs/libxfs/xfs_format.h | 26 --------- > > fs/xfs/libxfs/xfs_sb.c | 116 +++++++++++++++++++++++++------------ > > fs/xfs/libxfs/xfs_sb.h | 1 + > > 3 files changed, 81 insertions(+), 62 deletions(-) > > > ... > > diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c > > index bedf6c6bf990..b83cf8adca1a 100644 > > --- a/fs/xfs/libxfs/xfs_sb.c > > +++ b/fs/xfs/libxfs/xfs_sb.c > ... > > @@ -485,7 +523,7 @@ xfs_sb_quota_from_disk(struct xfs_sb *sbp) > > * We need to do these manipilations only if we are working > > * with an older version of on-disk superblock. > > */ > > - if (xfs_sb_version_haspquotino(sbp)) > > + if (XFS_SB_VERSION_NUM(sbp) < XFS_SB_VERSION_5) > > return; > > Isn't this backwards (we want to exit if == XFS_SB_VERSION_5)? Good catch, will fix. -Dave. -- Dave Chinner david@xxxxxxxxxxxxx
