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-06-14 16:10:55 -07:00
parent 9193fdea7e 67e8f48f1b
commit f2229fe24d
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
module/zfs/zfs_ioctl.c
View File

@ -104,8 +104,8 @@ static const char *userquota_perms[] = {
static int zfs_ioc_userspace_upgrade(struct file *filp, zfs_cmd_t *zc); static int zfs_ioc_userspace_upgrade(struct file *filp, zfs_cmd_t *zc);
static int zfs_check_settable(struct file *filp, const char *name, static int zfs_check_settable(struct file *filp, const char *name,
nvpair_t *property, cred_t *cr); nvpair_t *property, cred_t *cr);
static int zfs_check_clearable(char *dataset, nvlist_t *props, static int zfs_check_clearable(struct file *filp, char *dataset,
nvlist_t **errors); nvlist_t *props, nvlist_t **errors);
static int zfs_fill_zplprops_root(uint64_t, nvlist_t *, nvlist_t *, static int zfs_fill_zplprops_root(uint64_t, nvlist_t *, nvlist_t *,
boolean_t *); boolean_t *);
int zfs_set_prop_nvlist(struct file *filp, const char *, zprop_source_t, int zfs_set_prop_nvlist(struct file *filp, const char *, zprop_source_t,
@ -339,6 +339,7 @@ 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;
@ -426,6 +427,9 @@ 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
@ -958,7 +962,7 @@ fit_error_list(zfs_cmd_t *zc, nvlist_t **errors)
return (0); return (0);
} }
static int int
put_nvlist(zfs_cmd_t *zc, nvlist_t *nvl) put_nvlist(zfs_cmd_t *zc, nvlist_t *nvl)
{ {
char *packed = NULL; char *packed = NULL;
@ -1009,6 +1013,7 @@ getzfsvfs(const char *dsname, zfsvfs_t **zfvp)
dmu_objset_rele(os, FTAG); dmu_objset_rele(os, FTAG);
return (error); return (error);
} }
#endif
/* /*
* Find a zfsvfs_t for a mounted filesystem, or create our own, in which * Find a zfsvfs_t for a mounted filesystem, or create our own, in which
@ -1017,6 +1022,7 @@ getzfsvfs(const char *dsname, zfsvfs_t **zfvp)
static int static int
zfsvfs_hold(const char *name, void *tag, zfsvfs_t **zfvp) zfsvfs_hold(const char *name, void *tag, zfsvfs_t **zfvp)
{ {
#ifdef HAVE_ZPL
int error = 0; int error = 0;
if (getzfsvfs(name, zfvp) != 0) if (getzfsvfs(name, zfvp) != 0)
@ -1034,11 +1040,15 @@ zfsvfs_hold(const char *name, void *tag, zfsvfs_t **zfvp)
} }
} }
return (error); return (error);
#else
return ENOTSUP;
#endif
} }
static void static void
zfsvfs_rele(zfsvfs_t *zfsvfs, void *tag) zfsvfs_rele(zfsvfs_t *zfsvfs, void *tag)
{ {
#ifdef HAVE_ZPL
rrw_exit(&zfsvfs->z_teardown_lock, tag); rrw_exit(&zfsvfs->z_teardown_lock, tag);
if (zfsvfs->z_vfs) { if (zfsvfs->z_vfs) {
@ -1047,8 +1057,8 @@ zfsvfs_rele(zfsvfs_t *zfsvfs, void *tag)
dmu_objset_disown(zfsvfs->z_os, zfsvfs); dmu_objset_disown(zfsvfs->z_os, zfsvfs);
zfsvfs_free(zfsvfs); zfsvfs_free(zfsvfs);
} }
#endif
} }
#endif /* HAVE_ZPL */
static int static int
zfs_ioc_pool_create(struct file *filp, zfs_cmd_t *zc) zfs_ioc_pool_create(struct file *filp, zfs_cmd_t *zc)
@ -1559,8 +1569,7 @@ zfs_ioc_vdev_split(struct file *filp, zfs_cmd_t *zc)
} }
static int static int
zfs_ioc_vdev_setpath(zfs_cmd_t *zc) zfs_ioc_vdev_setpath(struct file *filp, zfs_cmd_t *zc)
>>>>>>> refs/top-bases/linux-kernel-device
{ {
spa_t *spa; spa_t *spa;
char *path = zc->zc_value; char *path = zc->zc_value;
@ -1888,6 +1897,7 @@ top:
static int static int
zfs_prop_set_userquota(struct file *filp, const char *dsname, nvpair_t *pair) zfs_prop_set_userquota(struct file *filp, const char *dsname, nvpair_t *pair)
{ {
#ifdef HAVE_ZPL
const char *propname = nvpair_name(pair); const char *propname = nvpair_name(pair);
uint64_t *valary; uint64_t *valary;
unsigned int vallen; unsigned int vallen;
@ -1928,6 +1938,9 @@ zfs_prop_set_userquota(struct file *filp, const char *dsname, nvpair_t *pair)
} }
return (err); return (err);
#else
return ENOTSUP;
#endif
} }
/* /*
@ -1949,7 +1962,7 @@ zfs_prop_set_special(struct file *filp, const char *dsname,
if (prop == ZPROP_INVAL) { if (prop == ZPROP_INVAL) {
if (zfs_prop_userquota(propname)) if (zfs_prop_userquota(propname))
return (zfs_prop_set_userquota(dsname, pair)); return (zfs_prop_set_userquota(filp, dsname, pair));
return (-1); return (-1);
} }
@ -1988,7 +2001,9 @@ zfs_prop_set_special(struct file *filp, const char *dsname,
if ((err = zfsvfs_hold(dsname, FTAG, &zfsvfs)) != 0) if ((err = zfsvfs_hold(dsname, FTAG, &zfsvfs)) != 0)
break; break;
#ifdef HAVE_ZPL
err = zfs_set_version(zfsvfs, intval); err = zfs_set_version(zfsvfs, intval);
#endif
zfsvfs_rele(zfsvfs, FTAG); zfsvfs_rele(zfsvfs, FTAG);
if (err == 0 && intval >= ZPL_VERSION_USERSPACE) { if (err == 0 && intval >= ZPL_VERSION_USERSPACE) {
@ -1996,7 +2011,7 @@ zfs_prop_set_special(struct file *filp, const char *dsname,
zc = kmem_zalloc(sizeof (zfs_cmd_t), KM_SLEEP); zc = kmem_zalloc(sizeof (zfs_cmd_t), KM_SLEEP);
(void) strcpy(zc->zc_name, dsname); (void) strcpy(zc->zc_name, dsname);
(void) zfs_ioc_userspace_upgrade(zc); (void) zfs_ioc_userspace_upgrade(filp, zc);
kmem_free(zc, sizeof (zfs_cmd_t)); kmem_free(zc, sizeof (zfs_cmd_t));
} }
break; break;
@ -2096,10 +2111,10 @@ retry:
/* Validate permissions */ /* Validate permissions */
if (err == 0) if (err == 0)
err = zfs_check_settable(dsname, pair, CRED()); err = zfs_check_settable(filp, dsname, pair, CRED());
if (err == 0) { if (err == 0) {
err = zfs_prop_set_special(dsname, source, pair); err = zfs_prop_set_special(filp, dsname, source, pair);
if (err == -1) { if (err == -1) {
/* /*
* For better performance we build up a list of * For better performance we build up a list of
@ -2228,8 +2243,8 @@ props_skip(nvlist_t *props, nvlist_t *skipped, nvlist_t **newprops)
} }
static int static int
clear_received_props(objset_t *os, const char *fs, nvlist_t *props, clear_received_props(struct file *filp, objset_t *os,
nvlist_t *skipped) const char *fs, nvlist_t *props, nvlist_t *skipped)
{ {
int err = 0; int err = 0;
nvlist_t *cleared_props = NULL; nvlist_t *cleared_props = NULL;
@ -2241,7 +2256,7 @@ clear_received_props(objset_t *os, const char *fs, nvlist_t *props,
*/ */
zprop_source_t flags = (ZPROP_SRC_NONE | zprop_source_t flags = (ZPROP_SRC_NONE |
(dsl_prop_get_hasrecvd(os) ? ZPROP_SRC_RECEIVED : 0)); (dsl_prop_get_hasrecvd(os) ? ZPROP_SRC_RECEIVED : 0));
err = zfs_set_prop_nvlist(fs, flags, cleared_props, NULL); err = zfs_set_prop_nvlist(filp, fs, flags, cleared_props, NULL);
} }
nvlist_free(cleared_props); nvlist_free(cleared_props);
return (err); return (err);
@ -2354,7 +2369,7 @@ zfs_ioc_inherit_prop(struct file *filp, zfs_cmd_t *zc)
} }
pair = nvlist_next_nvpair(dummy, NULL); pair = nvlist_next_nvpair(dummy, NULL);
err = zfs_prop_set_special(zc->zc_name, source, pair); err = zfs_prop_set_special(filp, zc->zc_name, source, pair);
nvlist_free(dummy); nvlist_free(dummy);
if (err != -1) if (err != -1)
return (err); /* special property already handled */ return (err); /* special property already handled */
@ -2520,6 +2535,7 @@ zfs_ioc_get_fsacl(struct file *filp, zfs_cmd_t *zc)
return (error); return (error);
} }
#ifdef HAVE_ZPL
/* /*
* Search the vfs list for a specified resource. Returns a pointer to it * Search the vfs list for a specified resource. Returns a pointer to it
* or NULL if no suitable entry is found. The caller of this routine * or NULL if no suitable entry is found. The caller of this routine
@ -3387,9 +3403,7 @@ static int
zfs_ioc_recv(struct file *filp, zfs_cmd_t *zc) zfs_ioc_recv(struct file *filp, zfs_cmd_t *zc)
{ {
file_t *fp; file_t *fp;
#ifdef HAVE_ZPL
objset_t *os; objset_t *os;
#endif /* HAVE_ZPL */
dmu_recv_cookie_t drc; dmu_recv_cookie_t drc;
boolean_t force = (boolean_t)zc->zc_guid; boolean_t force = (boolean_t)zc->zc_guid;
int fd; int fd;
@ -3425,7 +3439,6 @@ zfs_ioc_recv(struct file *filp, zfs_cmd_t *zc)
return (EBADF); return (EBADF);
} }
#ifdef HAVE_ZPL
VERIFY(nvlist_alloc(&errors, NV_UNIQUE_NAME, KM_SLEEP) == 0); VERIFY(nvlist_alloc(&errors, NV_UNIQUE_NAME, KM_SLEEP) == 0);
if (props && dmu_objset_hold(tofs, FTAG, &os) == 0) { if (props && dmu_objset_hold(tofs, FTAG, &os) == 0) {
@ -3451,7 +3464,7 @@ zfs_ioc_recv(struct file *filp, zfs_cmd_t *zc)
*/ */
if (!first_recvd_props) if (!first_recvd_props)
props_reduce(props, origprops); props_reduce(props, origprops);
if (zfs_check_clearable(tofs, origprops, if (zfs_check_clearable(filp, tofs, origprops,
&errlist) != 0) &errlist) != 0)
(void) nvlist_merge(errors, errlist, 0); (void) nvlist_merge(errors, errlist, 0);
nvlist_free(errlist); nvlist_free(errlist);
@ -3459,7 +3472,6 @@ zfs_ioc_recv(struct file *filp, zfs_cmd_t *zc)
dmu_objset_rele(os, FTAG); dmu_objset_rele(os, FTAG);
} }
#endif /* HAVE_ZPL */
if (zc->zc_string[0]) { if (zc->zc_string[0]) {
error = dmu_objset_hold(zc->zc_string, FTAG, &origin); error = dmu_objset_hold(zc->zc_string, FTAG, &origin);
@ -3488,7 +3500,7 @@ zfs_ioc_recv(struct file *filp, zfs_cmd_t *zc)
SPA_VERSION_RECVD_PROPS) SPA_VERSION_RECVD_PROPS)
first_recvd_props = B_TRUE; first_recvd_props = B_TRUE;
} else if (origprops != NULL) { } else if (origprops != NULL) {
if (clear_received_props(os, tofs, origprops, if (clear_received_props(filp,os,tofs,origprops,
first_recvd_props ? NULL : props) != 0) first_recvd_props ? NULL : props) != 0)
zc->zc_obj |= ZPROP_ERR_NOCLEAR; zc->zc_obj |= ZPROP_ERR_NOCLEAR;
} else { } else {