On Thu, Dec 07, 2017 at 10:18:42PM -0600, Eric Sandeen wrote: > sb_feat was a weird mishmash of hardcoded defaults and macros > (which were used in only this place). > > Make it consistent by removing the use-once macros, and remove > the unused XFS_DFL_LOG_SIZE while we're in here. > > Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > --- > include/xfs_multidisk.h | 3 --- > mkfs/xfs_mkfs.c | 4 ++-- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/include/xfs_multidisk.h b/include/xfs_multidisk.h > index e5f53b7..54913d8 100644 > --- a/include/xfs_multidisk.h > +++ b/include/xfs_multidisk.h > @@ -29,10 +29,7 @@ > #define XFS_MIN_DATA_BLOCKS 100 > #define XFS_MIN_INODE_PERBLOCK 2 /* min inodes per block */ > #define XFS_DFL_IMAXIMUM_PCT 25 /* max % of space for inodes */ > -#define XFS_IFLAG_ALIGN true /* -i align defaults on */ > #define XFS_MIN_REC_DIRSIZE 12 /* 4096 byte dirblocks (V2) */ > -#define XFS_DFL_DIR_VERSION 2 /* default directory version */ > -#define XFS_DFL_LOG_SIZE 1000 /* default log size, blocks */ > #define XFS_DFL_LOG_FACTOR 5 /* default log size, factor */ > /* with max trans reservation */ > #define XFS_MAX_INODE_SIG_BITS 32 /* most significant bits in an > diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c > index 3f6315d..a321ff2 100644 > --- a/mkfs/xfs_mkfs.c > +++ b/mkfs/xfs_mkfs.c > @@ -3850,8 +3850,8 @@ main( > .sb_feat = { > .log_version = 2, > .attr_version = 2, > - .dir_version = XFS_DFL_DIR_VERSION, > - .inode_align = XFS_IFLAG_ALIGN, > + .dir_version = 2, > + .inode_align = true, > .nci = false, > .lazy_sb_counters = true, > .projid32bit = true, > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html