Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module

module/zfs/zfs_ioctl.c

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