d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r284031: the change was already imported in r283534

Browse Source
This commit is contained in:
avg 2015-06-12 10:50:31 +00:00
parent f90444d14f
commit fb649f7936
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
uts/common/fs/zfs/zfs_ioctl.c
View File

@ -5132,19 +5132,6 @@ zfs_ioc_hold(const char *pool, nvlist_t *args, nvlist_t *errlist)
return (SET_ERROR(EINVAL));
}
/* make sure the user didn't pass us any invalid (empty) tags */
for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
pair = nvlist_next_nvpair(holds, pair)) {
char *htag;
error = nvpair_value_string(pair, &htag);
if (error != 0)
return (SET_ERROR(error));
if (strlen(htag) == 0)
return (SET_ERROR(EINVAL));
}
if (nvlist_lookup_int32(args, "cleanup_fd", &cleanup_fd) == 0) {
error = zfs_onexit_fd_hold(cleanup_fd, &minor);
if (error != 0)