[PATCH 13/19] mkfs: encode conflicts into parsing table

[Eric Sandeen]

Sorry, updated fixup patch; missed removal of "\" chars:



Remove now-encoded conflict under case L_FILE

The .conflicts handle this now, no need to keep it around.



Remove unneccesary continuation chars "\"

Eric Sandeen <sandeen at redhat.com>: remove explicit L_FILE conflict
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 963545b..e19181c 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -975,8 +975,7 @@ sb_set_features(
 	 */
 	if (fp->spinodes) {
 		sbp->sb_spino_align = sbp->sb_inoalignmt;
-		sbp->sb_inoalignmt = \
-			XFS_INODES_PER_CHUNK * \
+		sbp->sb_inoalignmt = XFS_INODES_PER_CHUNK *
 			sbp->sb_inodesize >> sbp->sb_blocklog;
 		sbp->sb_features_incompat |= XFS_SB_FEAT_INCOMPAT_SPINODES;
 	}
@@ -1090,7 +1089,7 @@ main(
 		.lazy_sb_counters = true,
 		.projid16bit = false,
 		.crcs_enabled = true,
-		.dirftype = false,
+		.dirftype = true,
 		.parent_pointers = false,
 	};
 
@@ -1109,7 +1108,6 @@ main(
 	liflag = laflag = lsflag = lsuflag = lsunitflag = ldflag = lvflag = 0;
 	loginternal = 1;
 	logagno = logblocks = rtblocks = rtextblocks = 0;
-	sb_feat.dirftype = 1;		/* inode type information in the dir */
 	Nflag = nlflag = nsflag = nvflag = 0;
 	nftype = 0;
 	dirblocklog = dirblocksize = 0;