Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-09 12:50:55 -08:00
commit 04730311d8
1 changed files with 0 additions and 4 deletions

View File

@ -349,8 +349,6 @@ 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));
@ -1478,8 +1476,6 @@ 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;