Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

This commit is contained in:
Brian Behlendorf 2008-12-05 09:34:15 -08:00
parent 7e732f2fc0 db27ad2a22
commit b720c5513a
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zfs/lib/libzfs/libzfs_changelist.c
View File

@ -140,6 +140,8 @@ changelist_prefix(prop_changelist_t *clp)
*/ */
(void) zfs_unshare_iscsi(cn->cn_handle); (void) zfs_unshare_iscsi(cn->cn_handle);
break; break;
default:
break;
} }
} else { } else {
/* /*
@ -156,6 +158,8 @@ changelist_prefix(prop_changelist_t *clp)
case ZFS_PROP_SHARESMB: case ZFS_PROP_SHARESMB:
(void) zfs_unshare_smb(cn->cn_handle, NULL); (void) zfs_unshare_smb(cn->cn_handle, NULL);
break; break;
default:
break;
} }
} }
} }

18
zfs/lib/libzfs/libzfs_dataset.c
View File

@ -72,6 +72,8 @@ zfs_type_to_name(zfs_type_t type)
return (dgettext(TEXT_DOMAIN, "snapshot")); return (dgettext(TEXT_DOMAIN, "snapshot"));
case ZFS_TYPE_VOLUME: case ZFS_TYPE_VOLUME:
return (dgettext(TEXT_DOMAIN, "volume")); return (dgettext(TEXT_DOMAIN, "volume"));
default:
break;
} }
return (NULL); return (NULL);
@ -181,6 +183,8 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type,
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"reserved disk name")); "reserved disk name"));
break; break;
default:
break;
} }
} }
@ -722,6 +726,8 @@ zfs_valid_proplist(libzfs_handle_t *hdl, zfs_type_t type, nvlist_t *nvl,
"component of '%s' is too long"), "component of '%s' is too long"),
propname); propname);
break; break;
default:
break;
} }
(void) zfs_error(hdl, EZFS_BADPROP, errbuf); (void) zfs_error(hdl, EZFS_BADPROP, errbuf);
goto error; goto error;
@ -846,6 +852,8 @@ zfs_valid_proplist(libzfs_handle_t *hdl, zfs_type_t type, nvlist_t *nvl,
case ZFS_PROP_NORMALIZE: case ZFS_PROP_NORMALIZE:
chosen_normal = (int)intval; chosen_normal = (int)intval;
break; break;
default:
break;
} }
/* /*
@ -894,6 +902,8 @@ zfs_valid_proplist(libzfs_handle_t *hdl, zfs_type_t type, nvlist_t *nvl,
goto error; goto error;
} }
break; break;
default:
break;
} }
} }
} }
@ -1136,6 +1146,8 @@ zfs_build_perms(zfs_handle_t *zhp, char *whostr, char *perms,
dgettext(TEXT_DOMAIN, dgettext(TEXT_DOMAIN,
"set definition must begin with an '@' " "set definition must begin with an '@' "
"character")); "character"));
default:
break;
} }
return (zfs_error(zhp->zfs_hdl, return (zfs_error(zhp->zfs_hdl,
EZFS_BADPERMSET, whostr)); EZFS_BADPERMSET, whostr));
@ -1565,6 +1577,8 @@ zfs_perm_get(zfs_handle_t *zhp, zfs_allow_t **zfs_perms)
&nvpair_name(who_pair)[3]); &nvpair_name(who_pair)[3]);
tree = &zallowp->z_sets; tree = &zallowp->z_sets;
break; break;
default:
break;
} }
/* /*
@ -1717,6 +1731,8 @@ zfs_deleg_perm_type_str(zfs_deleg_perm_type_t type)
return (dgettext(TEXT_DOMAIN, "property")); return (dgettext(TEXT_DOMAIN, "property"));
case ZFS_DELEG_OTHER: case ZFS_DELEG_OTHER:
return (dgettext(TEXT_DOMAIN, "other")); return (dgettext(TEXT_DOMAIN, "other"));
default:
break;
} }
return (""); return ("");
} }
@ -2114,6 +2130,8 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src,
mntopt_on = MNTOPT_NBMAND; mntopt_on = MNTOPT_NBMAND;
mntopt_off = MNTOPT_NONBMAND; mntopt_off = MNTOPT_NONBMAND;
break; break;
default:
break;
} }
/* /*

2
zfs/lib/libzpool/spa.c
View File

@ -393,6 +393,8 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
strcmp(slash, "/..") == 0) strcmp(slash, "/..") == 0)
error = EINVAL; error = EINVAL;
break; break;
default:
break;
} }
if (error) if (error)

2
zfs/lib/libzpool/vdev_label.c
View File

@ -458,6 +458,8 @@ vdev_inuse(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason,
case VDEV_LABEL_SPARE: case VDEV_LABEL_SPARE:
return (spa_has_spare(spa, device_guid)); return (spa_has_spare(spa, device_guid));
default:
break;
} }
} }

4
zfs/lib/libzpool/zfs_ioctl.c
View File

@ -349,6 +349,8 @@ zfs_secpolicy_setprop(const char *name, zfs_prop_t prop, cred_t *cr)
return (EPERM); return (EPERM);
} }
break; break;
default:
break;
} }
return (zfs_secpolicy_write_perms(name, zfs_prop_to_name(prop), cr)); return (zfs_secpolicy_write_perms(name, zfs_prop_to_name(prop), cr));
@ -1472,6 +1474,8 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl)
SPA_VERSION_PASSTHROUGH_X)) SPA_VERSION_PASSTHROUGH_X))
return (ENOTSUP); return (ENOTSUP);
} }
default:
break;
} }
elem = NULL; elem = NULL;