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 gcc missing parenthesis warnings
[zfs.git]
/
module
/
zfs
/
zfs_ioctl.c
diff --git
a/module/zfs/zfs_ioctl.c
b/module/zfs/zfs_ioctl.c
index
ff31144
..
4e26cae
100644
(file)
--- a/
module/zfs/zfs_ioctl.c
+++ b/
module/zfs/zfs_ioctl.c
@@
-483,6
+483,8
@@
zfs_secpolicy_setprop(const char *dsname, zfs_prop_t prop, nvpair_t *propval,
* Check permissions for special properties.
*/
switch (prop) {
* Check permissions for special properties.
*/
switch (prop) {
+ default:
+ break;
case ZFS_PROP_ZONED:
/*
* Disallow setting of 'zoned' from within a local zone.
case ZFS_PROP_ZONED:
/*
* Disallow setting of 'zoned' from within a local zone.
@@
-1162,8
+1164,8
@@
zfs_ioc_pool_create(zfs_cmd_t *zc)
nvlist_t *zplprops = NULL;
char *buf;
nvlist_t *zplprops = NULL;
char *buf;
- if (error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
- zc->zc_iflags, &config))
+ if (
(
error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
+ zc->zc_iflags, &config))
)
return (error);
if (zc->zc_nvlist_src_size != 0 && (error =
return (error);
if (zc->zc_nvlist_src_size != 0 && (error =
@@
-1452,7
+1454,7
@@
zfs_ioc_dsobj_to_dsname(zfs_cmd_t *zc)
{
int error;
{
int error;
- if (
error = dsl_dsobj_to_dsname(zc->zc_name, zc->zc_obj, zc->zc_value
))
+ if (
(error = dsl_dsobj_to_dsname(zc->zc_name,zc->zc_obj,zc->zc_value)
))
return (error);
return (0);
return (error);
return (0);
@@
-1668,8
+1670,8
@@
zfs_ioc_vdev_split(zfs_cmd_t *zc)
if ((error = spa_open(zc->zc_name, &spa, FTAG)) != 0)
return (error);
if ((error = spa_open(zc->zc_name, &spa, FTAG)) != 0)
return (error);
- if (error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
- zc->zc_iflags, &config)) {
+ if (
(
error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
+ zc->zc_iflags, &config))
)
{
spa_close(spa, FTAG);
return (error);
}
spa_close(spa, FTAG);
return (error);
}
@@
-1771,7
+1773,7
@@
zfs_ioc_objset_stats(zfs_cmd_t *zc)
objset_t *os = NULL;
int error;
objset_t *os = NULL;
int error;
- if (
error = dmu_objset_hold(zc->zc_name, FTAG, &os
))
+ if (
(error = dmu_objset_hold(zc->zc_name, FTAG, &os)
))
return (error);
error = zfs_ioc_objset_stats_impl(zc, os);
return (error);
error = zfs_ioc_objset_stats_impl(zc, os);
@@
-1795,13
+1797,13
@@
zfs_ioc_objset_stats(zfs_cmd_t *zc)
* local property values.
*/
static int
* local property values.
*/
static int
-zfs_ioc_objset_recvd_props(zfs_cmd_t *zc)
+zfs_ioc_objset_recvd_props(
struct file *filp,
zfs_cmd_t *zc)
{
objset_t *os = NULL;
int error;
nvlist_t *nv;
{
objset_t *os = NULL;
int error;
nvlist_t *nv;
- if (
error = dmu_objset_hold(zc->zc_name, FTAG, &os
))
+ if (
(error = dmu_objset_hold(zc->zc_name, FTAG, &os)
))
return (error);
/*
return (error);
/*
@@
-1856,7
+1858,7
@@
zfs_ioc_objset_zplprops(zfs_cmd_t *zc)
int err;
/* XXX reading without owning */
int err;
/* XXX reading without owning */
- if (
err = dmu_objset_hold(zc->zc_name, FTAG, &os
))
+ if (
(err = dmu_objset_hold(zc->zc_name, FTAG, &os)
))
return (err);
dmu_objset_fast_stat(os, &zc->zc_objset_stats);
return (err);
dmu_objset_fast_stat(os, &zc->zc_objset_stats);
@@
-1924,7
+1926,7
@@
zfs_ioc_dataset_list_next(zfs_cmd_t *zc)
size_t orig_len = strlen(zc->zc_name);
top:
size_t orig_len = strlen(zc->zc_name);
top:
- if (
error = dmu_objset_hold(zc->zc_name, FTAG, &os
)) {
+ if (
(error = dmu_objset_hold(zc->zc_name, FTAG, &os)
)) {
if (error == ENOENT)
error = ESRCH;
return (error);
if (error == ENOENT)
error = ESRCH;
return (error);
@@
-2366,8
+2368,8
@@
zfs_check_userprops(char *fsname, nvlist_t *nvl)
nvpair_type(pair) != DATA_TYPE_STRING)
return (EINVAL);
nvpair_type(pair) != DATA_TYPE_STRING)
return (EINVAL);
- if (error = zfs_secpolicy_write_perms(fsname,
- ZFS_DELEG_PERM_USERPROP, CRED()))
+ if (
(
error = zfs_secpolicy_write_perms(fsname,
+ ZFS_DELEG_PERM_USERPROP, CRED()))
)
return (error);
if (strlen(propname) >= ZAP_MAXNAMELEN)
return (error);
if (strlen(propname) >= ZAP_MAXNAMELEN)
@@
-2550,8
+2552,8
@@
zfs_ioc_pool_set_props(zfs_cmd_t *zc)
int error;
nvpair_t *pair;
int error;
nvpair_t *pair;
- if (error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
- zc->zc_iflags, &props))
+ if (
(
error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
+ zc->zc_iflags, &props))
)
return (error);
/*
return (error);
/*
@@
-3272,8
+3274,8
@@
zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr)
if (prop == ZPROP_INVAL) {
if (zfs_prop_user(propname)) {
if (prop == ZPROP_INVAL) {
if (zfs_prop_user(propname)) {
- if (err = zfs_secpolicy_write_perms(dsname,
- ZFS_DELEG_PERM_USERPROP, cr))
+ if (
(
err = zfs_secpolicy_write_perms(dsname,
+ ZFS_DELEG_PERM_USERPROP, cr))
)
return (err);
return (0);
}
return (err);
return (0);
}
@@
-3296,7
+3298,7
@@
zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr)
return (EINVAL);
}
return (EINVAL);
}
- if (
err = zfs_secpolicy_write_perms(dsname, perm, cr
))
+ if (
(err = zfs_secpolicy_write_perms(dsname, perm, cr)
))
return (err);
return (0);
}
return (err);
return (0);
}
@@
-3380,6
+3382,8
@@
zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr)
return (ENOTSUP);
}
break;
return (ENOTSUP);
}
break;
+ default:
+ break;
}
return (zfs_secpolicy_setprop(dsname, prop, pair, CRED()));
}
return (zfs_secpolicy_setprop(dsname, prop, pair, CRED()));