From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 4 Jan 2018 19:58:10 +0000 (-0600)
Subject: mkfs: do not allow both "dev" and "name" subopts for log or realtime
X-Git-Tag: v4.15.0-rc1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9502da215bb8affebc968586c2d7b79693b04fb6;p=thirdparty%2Fxfsprogs-dev.git

mkfs: do not allow both "dev" and "name" subopts for log or realtime

Todauy this works, with last-parsed-wins semantics:

mkfs.xfs -f -l logdev=/dev/sda1,name=/dev/sda2 /dev/sda3

Disallow it to avoid ambiguity.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 60f9c5794..5f1ac9fdd 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -507,6 +507,7 @@ struct opt_params lopts = {
 		},
 		{ .index = L_DEV,
 		  .conflicts = { { &lopts, L_AGNUM },
+				 { &lopts, L_NAME },
 				 { &lopts, L_INTERNAL },
 				 { NULL, LAST_CONFLICT } },
 		  .defaultval = SUBOPT_NEEDS_VAL,
@@ -529,6 +530,7 @@ struct opt_params lopts = {
 		},
 		{ .index = L_NAME,
 		  .conflicts = { { &lopts, L_AGNUM },
+				 { &lopts, L_DEV },
 				 { &lopts, L_INTERNAL },
 				 { NULL, LAST_CONFLICT } },
 		  .defaultval = SUBOPT_NEEDS_VAL,
@@ -599,7 +601,8 @@ struct opt_params ropts = {
 		  .defaultval = SUBOPT_NEEDS_VAL,
 		},
 		{ .index = R_DEV,
-		  .conflicts = { { NULL, LAST_CONFLICT } },
+		  .conflicts = { { &ropts, R_NAME },
+			         { NULL, LAST_CONFLICT } },
 		  .defaultval = SUBOPT_NEEDS_VAL,
 		},
 		{ .index = R_FILE,
@@ -609,7 +612,8 @@ struct opt_params ropts = {
 		  .conflicts = { { NULL, LAST_CONFLICT } },
 		},
 		{ .index = R_NAME,
-		  .conflicts = { { NULL, LAST_CONFLICT } },
+		  .conflicts = { { &ropts, R_DEV },
+			         { NULL, LAST_CONFLICT } },
 		  .defaultval = SUBOPT_NEEDS_VAL,
 		},
 		{ .index = R_NOALIGN,