diff options
| author | Chunwei Chen <[email protected]> | 2016-12-09 10:52:08 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-03 10:25:22 -0800 |
| commit | f3da7a1b401883dc5bfc9ba8cc1f1acb0079cfc8 (patch) | |
| tree | 236311525d7b43d68fcce01131ba41e65d57acef /module/zfs | |
| parent | 625ee0a5e0121401bc02b312284975a33312809e (diff) | |
Don't count '@' for dataset namelen if not a snapshot
Don't count '@' for dataset namelen if not a snapshot. This
fixes making a pool unimportable when the dataset namelen
is 255.
Add test file for zfs create name length 255.
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Chunwei Chen <[email protected]>
Closes #5432
Closes #5456
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/dsl_dataset.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index 7124f3d6a..9bbb6fae2 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/zfs/dsl_dataset.c @@ -671,7 +671,11 @@ dsl_dataset_namelen(dsl_dataset_t *ds) int len; VERIFY0(dsl_dataset_get_snapname(ds)); mutex_enter(&ds->ds_lock); - len = dsl_dir_namelen(ds->ds_dir) + 1 + strlen(ds->ds_snapname); + len = strlen(ds->ds_snapname); + /* add '@' if ds is a snap */ + if (len > 0) + len++; + len += dsl_dir_namelen(ds->ds_dir); mutex_exit(&ds->ds_lock); return (len); } |