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

Eric Sandeen sandeen at sandeen.net
Mon May 2 18:11:01 CDT 2016


Remove now-encoded conflict under case L_FILE

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

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

---
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 03d3c06..cdc81a9 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1867,9 +1867,6 @@ main(
 				case L_FILE:
 					xi.lisfile = getnum(value, &lopts,
 							    L_FILE);
-					if (xi.lisfile && loginternal)
-						conflict('l', subopts, L_INTERNAL,
-							 L_FILE);
 					if (xi.lisfile)
 						xi.lcreat = 1;
 					break;




More information about the xfs mailing list