diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2018-01-03 14:10:10 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2018-01-03 14:10:10 -0600 |
| commit | 129d98a9966aef9c9c7c540fcd35d8cbfa500c97 (patch) | |
| tree | b346b1a71dba5f53263d0d2477ff5cda63ca22a6 | |
| parent | 852b32584e25ce004f6a132b04a1f36b1dc23670 (diff) | |
| download | xfsprogs-dev-129d98a9966aef9c9c7c540fcd35d8cbfa500c97.tar.gz | |
mkfs: remove use-once default macros
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@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | include/xfs_multidisk.h | 3 | ||||
| -rw-r--r-- | 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 e5f53b7ea0..54913d86cd 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 ec64a46224..2fd4e86617 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, |