diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2018-01-04 13:58:10 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2018-01-04 13:58:10 -0600 |
| commit | 9502da215bb8affebc968586c2d7b79693b04fb6 (patch) | |
| tree | 307641e95fefa1ba1f8f370c2aba65b1b83dd434 | |
| parent | e5e612ae728a9c88aa8eeefdaf61f4a65513b49d (diff) | |
| download | xfsprogs-dev-9502da215bb8affebc968586c2d7b79693b04fb6.tar.gz | |
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>
| -rw-r--r-- | mkfs/xfs_mkfs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 60f9c5794b..5f1ac9fddf 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, |