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

Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 

Conflicts:

	lib/libzfs/libzfs_dataset.c
This commit is contained in:
Brian Behlendorf 2009-07-07 14:11:46 -07:00
parent c687f41e5f 34422f0ffa
commit 8e7e41cfb0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libzfs/libzfs_dataset.c
View File

@ -2141,7 +2141,7 @@ zfs_prop_get_userquota_common(zfs_handle_t *zhp, const char *propname,
uint64_t *propvalue, zfs_userquota_prop_t *typep) uint64_t *propvalue, zfs_userquota_prop_t *typep)
{ {
int err; int err;
zfs_cmd_t zc = { 0 }; zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
(void) strncpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name)); (void) strncpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
@ -2185,7 +2185,8 @@ zfs_prop_get_userquota(zfs_handle_t *zhp, const char *propname,
return (err); return (err);
if (literal) { if (literal) {
(void) snprintf(propbuf, proplen, "%llu", propvalue); (void) snprintf(propbuf, proplen, "%llu",
(u_longlong_t)propvalue);
} else if (propvalue == 0 && } else if (propvalue == 0 &&
(type == ZFS_PROP_USERQUOTA || type == ZFS_PROP_GROUPQUOTA)) { (type == ZFS_PROP_USERQUOTA || type == ZFS_PROP_GROUPQUOTA)) {
(void) strlcpy(propbuf, "none", proplen); (void) strlcpy(propbuf, "none", proplen);
@ -3630,7 +3631,7 @@ zvol_create_link_common(libzfs_handle_t *hdl, const char *dataset, int ifexists)
dgettext(TEXT_DOMAIN, "cannot create device links " dgettext(TEXT_DOMAIN, "cannot create device links "
"for '%s'"), dataset)); "for '%s'"), dataset));
#else #else
zfs_cmd_t zc = { 0 }; zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
di_devlink_handle_t dhdl; di_devlink_handle_t dhdl;
priv_set_t *priv_effective; priv_set_t *priv_effective;
int privileged; int privileged;
@ -3858,7 +3859,7 @@ zfs_iscsi_perm_check(libzfs_handle_t *hdl, char *dataset, ucred_t *cred)
#if !defined(HAVE_ZVOL) #if !defined(HAVE_ZVOL)
return (ENOTSUP); return (ENOTSUP);
#else #else
zfs_cmd_t zc = { 0 }; zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
nvlist_t *nvp; nvlist_t *nvp;
gid_t gid; gid_t gid;
uid_t uid; uid_t uid;
@ -3955,7 +3956,7 @@ static int
zfs_smb_acl_mgmt(libzfs_handle_t *hdl, char *dataset, char *path, zfs_smb_acl_mgmt(libzfs_handle_t *hdl, char *dataset, char *path,
zfs_smb_acl_op_t cmd, char *resource1, char *resource2) zfs_smb_acl_op_t cmd, char *resource1, char *resource2)
{ {
zfs_cmd_t zc = { 0 }; zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
nvlist_t *nvlist = NULL; nvlist_t *nvlist = NULL;
int error; int error;
@ -4037,7 +4038,7 @@ int
zfs_userspace(zfs_handle_t *zhp, zfs_userquota_prop_t type, zfs_userspace(zfs_handle_t *zhp, zfs_userquota_prop_t type,
zfs_userspace_cb_t func, void *arg) zfs_userspace_cb_t func, void *arg)
{ {
zfs_cmd_t zc = { 0 }; zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
int error; int error;
zfs_useracct_t buf[100]; zfs_useracct_t buf[100];