Merge commit 'refs/top-bases/linux-arc' into linux-arc

This commit is contained in:
Brian Behlendorf 2009-07-07 14:28:16 -07:00
commit c485f68fe3
1 changed files with 1 additions and 1 deletions

View File

@ -3957,7 +3957,7 @@ zfs_smb_acl_mgmt(libzfs_handle_t *hdl, char *dataset, char *path,
if (cmd == ZFS_SMB_ACL_RENAME) {
if (nvlist_alloc(&nvlist, NV_UNIQUE_NAME, 0) != 0) {
(void) no_memory(hdl);
return (NULL);
return (-1);
}
}