Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
This commit is contained in:
commit
7a7a074d3d
|
@ -2189,7 +2189,7 @@ zfs_ioc_snapshot(zfs_cmd_t *zc)
|
||||||
if (snapshot_namecheck(zc->zc_value, NULL, NULL) != 0)
|
if (snapshot_namecheck(zc->zc_value, NULL, NULL) != 0)
|
||||||
return (EINVAL);
|
return (EINVAL);
|
||||||
|
|
||||||
if (zc->zc_nvlist_src != NULL &&
|
if (zc->zc_nvlist_src != 0 &&
|
||||||
(error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
|
(error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
|
||||||
&nvprops)) != 0)
|
&nvprops)) != 0)
|
||||||
return (error);
|
return (error);
|
||||||
|
|
Loading…
Reference in New Issue