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

Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-07-22 16:50:42 -07:00
parent 36762cb6f6 c979e4bdf8
commit 0c1211f8fb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/zfs_ioctl.c
View File

@ -339,7 +339,6 @@ zfs_secpolicy_write_perms(const char *name, const char *perm, cred_t *cr)
static int static int
zfs_set_slabel_policy(const char *name, char *strval, cred_t *cr) zfs_set_slabel_policy(const char *name, char *strval, cred_t *cr)
{ {
#if 0
char ds_hexsl[MAXNAMELEN]; char ds_hexsl[MAXNAMELEN];
bslabel_t ds_sl, new_sl; bslabel_t ds_sl, new_sl;
boolean_t new_default = FALSE; boolean_t new_default = FALSE;
@ -427,9 +426,6 @@ out_check:
if (needed_priv != -1) if (needed_priv != -1)
return (PRIV_POLICY(cr, needed_priv, B_FALSE, EPERM, NULL)); return (PRIV_POLICY(cr, needed_priv, B_FALSE, EPERM, NULL));
return (0); return (0);
#else
return EPERM;
#endif
} }
static int static int