summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2009-03-12 10:00:01 -0700
committerBrian Behlendorf <[email protected]>2009-03-12 10:00:01 -0700
commiteceaf813ad56381192222ecf85a35aaea5585353 (patch)
treed3dafe546014c2bd035acd2e12c78f106f885447
parenta2dc88da2aa76ee7887d3ef5e9f352a1e1761920 (diff)
parentf2d72af596b54f11a92eb3893d4431cfcb59fcf2 (diff)
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
-rw-r--r--cmd/zinject/translate.c6
-rw-r--r--lib/libzfs/libzfs_pool.c9
-rw-r--r--module/zfs/arc.c4
-rw-r--r--module/zfs/spa.c2
-rw-r--r--module/zfs/zfs_ioctl.c4
5 files changed, 24 insertions, 1 deletions
diff --git a/cmd/zinject/translate.c b/cmd/zinject/translate.c
index c85e024b6..d8654594d 100644
--- a/cmd/zinject/translate.c
+++ b/cmd/zinject/translate.c
@@ -221,6 +221,8 @@ calculate_range(const char *dataset, err_type_t type, int level, char *range,
}
switch (type) {
+ default:
+ break;
case TYPE_DATA:
break;
@@ -335,6 +337,8 @@ translate_record(err_type_t type, const char *object, const char *range,
* MOS objects are treated specially.
*/
switch (type) {
+ default:
+ break;
case TYPE_MOS:
record->zi_type = 0;
break;
@@ -461,6 +465,8 @@ translate_device(const char *pool, const char *device, err_type_t label_type,
}
switch (label_type) {
+ default:
+ break;
case TYPE_LABEL_UBERBLOCK:
record->zi_start = offsetof(vdev_label_t, vl_uberblock[0]);
record->zi_end = record->zi_start + VDEV_UBERBLOCK_RING - 1;
diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
index 677fb8faa..a0b323cec 100644
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@ -180,6 +180,8 @@ char *
zpool_state_to_name(vdev_state_t state, vdev_aux_t aux)
{
switch (state) {
+ default:
+ break;
case VDEV_STATE_CLOSED:
case VDEV_STATE_OFFLINE:
return (gettext("OFFLINE"));
@@ -414,6 +416,8 @@ zpool_valid_proplist(libzfs_handle_t *hdl, const char *poolname,
* Perform additional checking for specific properties.
*/
switch (prop) {
+ default:
+ break;
case ZPOOL_PROP_VERSION:
if (intval < version || intval > SPA_VERSION) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
@@ -706,7 +710,10 @@ zpool_name_valid(libzfs_handle_t *hdl, boolean_t isopen, const char *pool)
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"multiple '@' delimiters in name"));
break;
-
+ case NAME_ERR_NO_AT:
+ zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+ "permission set is missing '@'"));
+ break;
}
}
return (B_FALSE);
diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index 9b210baa3..31b337b0f 100644
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -1110,6 +1110,8 @@ arc_space_consume(uint64_t space, arc_space_type_t type)
ASSERT(type >= 0 && type < ARC_SPACE_NUMTYPES);
switch (type) {
+ default:
+ break;
case ARC_SPACE_DATA:
ARCSTAT_INCR(arcstat_data_size, space);
break;
@@ -1134,6 +1136,8 @@ arc_space_return(uint64_t space, arc_space_type_t type)
ASSERT(type >= 0 && type < ARC_SPACE_NUMTYPES);
switch (type) {
+ default:
+ break;
case ARC_SPACE_DATA:
ARCSTAT_INCR(arcstat_data_size, -space);
break;
diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 5a34ed29f..40235da9e 100644
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -1054,6 +1054,8 @@ spa_check_logs(spa_t *spa)
(void) dmu_objset_find(spa->spa_name, zil_clear_log_chain, NULL,
DS_FIND_CHILDREN);
break;
+ case SPA_LOG_GOOD:
+ break;
}
spa->spa_log_state = SPA_LOG_GOOD;
return (0);
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 7a7bc172b..3cdd1d8c3 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -325,6 +325,8 @@ zfs_secpolicy_setprop(const char *name, zfs_prop_t prop, cred_t *cr)
* Check permissions for special properties.
*/
switch (prop) {
+ default:
+ break;
case ZFS_PROP_ZONED:
/*
* Disallow setting of 'zoned' from within a local zone.
@@ -1438,6 +1440,8 @@ zfs_set_prop_nvlist(const char *name, nvlist_t *nvl)
* Check that this value is valid for this pool version
*/
switch (prop) {
+ default:
+ break;
case ZFS_PROP_COMPRESSION:
/*
* If the user specified gzip compression, make sure