From f3da7a1b401883dc5bfc9ba8cc1f1acb0079cfc8 Mon Sep 17 00:00:00 2001 From: Chunwei Chen Date: Fri, 9 Dec 2016 10:52:08 -0800 Subject: 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 Reviewed-by: Brian Behlendorf Signed-off-by: Chunwei Chen Closes #5432 Closes #5456 --- module/zfs/dsl_dataset.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'module/zfs') 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); } -- cgit v1.2.3