diff options
| author | Ryan Moeller <[email protected]> | 2021-04-01 11:49:41 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-04-07 13:24:46 -0700 |
| commit | 895d39aa832a6d90cb15263f8bbe41509baa3867 (patch) | |
| tree | 34fccde40915f55e856f5c19f93baca902666235 | |
| parent | 7f789e150f8d8df79e90748046a8469ec354e1a4 (diff) | |
Allow pool names that look like Solaris disk names
Nothing bad happens if a prefix of your pool name matches a disk name.
This is a bit of a silly restriction at this point.
Reviewed-by: Richard Laager <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #11781
Closes #11813
| -rw-r--r-- | module/zcommon/zfs_namecheck.c | 6 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/module/zcommon/zfs_namecheck.c b/module/zcommon/zfs_namecheck.c index 0011a971c..7ecce451b 100644 --- a/module/zcommon/zfs_namecheck.c +++ b/module/zcommon/zfs_namecheck.c @@ -450,12 +450,6 @@ pool_namecheck(const char *pool, namecheck_err_t *why, char *what) return (-1); } - if (pool[0] == 'c' && (pool[1] >= '0' && pool[1] <= '9')) { - if (why) - *why = NAME_ERR_DISKLIKE; - return (-1); - } - return (0); } diff --git a/tests/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh b/tests/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh index 0c96e1999..0b40f7cd2 100755 --- a/tests/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh +++ b/tests/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh @@ -106,7 +106,7 @@ do done log_note "Verify invalid pool names fail" -set -A POOLNAME "c0t0d0s0" "c0t0d0" "c0t0d19" "c0t50000E0108D279d0" \ +set -A POOLNAME \ "mirror" "raidz" ",," ",,,,,,,,,,,,,,,,,,,,,,,,," \ "2222222222222222222" "mirror_pool" "raidz_pool" \ "mirror-pool" "raidz-pool" "spare" "spare_pool" \ |