git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix zmod.h usage in userspace
[zfs.git]
/
module
/
zfs
/
dsl_prop.c
diff --git
a/module/zfs/dsl_prop.c
b/module/zfs/dsl_prop.c
index
aa66b32
..
af99d74
100644
(file)
--- a/
module/zfs/dsl_prop.c
+++ b/
module/zfs/dsl_prop.c
@@
-413,6
+413,8
@@
dsl_prop_check_prediction(dsl_dir_t *dd, dsl_prop_setarg_t *psa)
case ZFS_PROP_QUOTA:
case ZFS_PROP_RESERVATION:
return;
case ZFS_PROP_QUOTA:
case ZFS_PROP_RESERVATION:
return;
+ default:
+ break;
}
}
}
}
@@
-828,7
+830,7
@@
dsl_props_set(const char *dsname, zprop_source_t source, nvlist_t *props)
dsl_props_arg_t pa;
int err;
dsl_props_arg_t pa;
int err;
- if (
err = dsl_dataset_hold(dsname, FTAG, &ds
))
+ if (
(err = dsl_dataset_hold(dsname, FTAG, &ds)
))
return (err);
/*
* Do these checks before the syncfunc, since it can't fail.
return (err);
/*
* Do these checks before the syncfunc, since it can't fail.