Fix minor compiler warnings
These compiler warnings were introduced when code which was previously #ifdef'ed out by HAVE_ZPL was re-added for use by the posix layer. All of the following changes should be obviously correct and will cause no semantic changes.
This commit is contained in:
Brian Behlendorf
parent
683fe41fc7
commit
149e873ab1
@ -3153,11 +3153,11 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
|
||||
shared_nfs = zfs_is_shared_nfs(zhp, NULL);
|
||||
shared_smb = zfs_is_shared_smb(zhp, NULL);
|
||||
|
||||
if (shared_nfs && shared_smb ||
|
||||
(shared_nfs && strcmp(shareopts, "on") == 0 &&
|
||||
strcmp(smbshareopts, "off") == 0) ||
|
||||
(shared_smb && strcmp(smbshareopts, "on") == 0 &&
|
||||
strcmp(shareopts, "off") == 0)) {
|
||||
if ((shared_nfs && shared_smb) ||
|
||||
((shared_nfs && strcmp(shareopts, "on") == 0) &&
|
||||
(strcmp(smbshareopts, "off") == 0)) ||
|
||||
((shared_smb && strcmp(smbshareopts, "on") == 0) &&
|
||||
(strcmp(shareopts, "off") == 0))) {
|
||||
if (!explicit)
|
||||
return (0);
|
||||
|
||||
@ -3622,7 +3622,7 @@ unshare_unmount(int op, int argc, char **argv)
|
||||
*/
|
||||
struct mnttab entry;
|
||||
uu_avl_pool_t *pool;
|
||||
uu_avl_t *tree;
|
||||
uu_avl_t *tree = NULL;
|
||||
unshare_unmount_node_t *node;
|
||||
uu_avl_index_t idx;
|
||||
uu_avl_walk_t *walk;
|
||||
|
||||
@ -566,7 +566,7 @@ main(int argc, char **argv)
|
||||
zinject_record_t record = { 0 };
|
||||
char pool[MAXNAMELEN];
|
||||
char dataset[MAXNAMELEN];
|
||||
zfs_handle_t *zhp;
|
||||
zfs_handle_t *zhp = NULL;
|
||||
int nowrites = 0;
|
||||
int dur_txg = 0;
|
||||
int dur_secs = 0;
|
||||
|
||||
@ -467,7 +467,7 @@ zfs_is_shared_proto(zfs_handle_t *zhp, char **where, zfs_share_proto_t proto)
|
||||
if (!zfs_is_mounted(zhp, &mountpoint))
|
||||
return (SHARED_NOT_SHARED);
|
||||
|
||||
if (rc = is_shared(zhp->zfs_hdl, mountpoint, proto)) {
|
||||
if ((rc = is_shared(zhp->zfs_hdl, mountpoint, proto))) {
|
||||
if (where != NULL)
|
||||
*where = mountpoint;
|
||||
else
|
||||
|
||||
@ -494,7 +494,7 @@ zfs_acl_release_nodes(zfs_acl_t *aclp)
|
||||
{
|
||||
zfs_acl_node_t *aclnode;
|
||||
|
||||
while (aclnode = list_head(&aclp->z_acl)) {
|
||||
while ((aclnode = list_head(&aclp->z_acl))) {
|
||||
list_remove(&aclp->z_acl, aclnode);
|
||||
zfs_acl_node_free(aclnode);
|
||||
}
|
||||
@ -732,8 +732,8 @@ zfs_copy_fuid_2_ace(zfsvfs_t *zfsvfs, zfs_acl_t *aclp, cred_t *cr,
|
||||
size_t ace_size;
|
||||
uint16_t entry_type;
|
||||
|
||||
while (zacep = zfs_acl_next_ace(aclp, zacep,
|
||||
&who, &access_mask, &iflags, &type)) {
|
||||
while ((zacep = zfs_acl_next_ace(aclp, zacep,
|
||||
&who, &access_mask, &iflags, &type))) {
|
||||
|
||||
switch (type) {
|
||||
case ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE:
|
||||
@ -823,8 +823,8 @@ zfs_acl_xform(znode_t *zp, zfs_acl_t *aclp, cred_t *cr)
|
||||
oldaclp = kmem_alloc(sizeof (zfs_oldace_t) * aclp->z_acl_count,
|
||||
KM_SLEEP);
|
||||
i = 0;
|
||||
while (cookie = zfs_acl_next_ace(aclp, cookie, &who,
|
||||
&access_mask, &iflags, &type)) {
|
||||
while ((cookie = zfs_acl_next_ace(aclp, cookie, &who,
|
||||
&access_mask, &iflags, &type))) {
|
||||
oldaclp[i].z_flags = iflags;
|
||||
oldaclp[i].z_type = type;
|
||||
oldaclp[i].z_fuid = who;
|
||||
@ -904,8 +904,8 @@ zfs_mode_compute(uint64_t fmode, zfs_acl_t *aclp,
|
||||
|
||||
mode = (fmode & (S_IFMT | S_ISUID | S_ISGID | S_ISVTX));
|
||||
|
||||
while (acep = zfs_acl_next_ace(aclp, acep, &who,
|
||||
&access_mask, &iflags, &type)) {
|
||||
while ((acep = zfs_acl_next_ace(aclp, acep, &who,
|
||||
&access_mask, &iflags, &type))) {
|
||||
|
||||
if (!zfs_acl_valid_ace_type(type, iflags))
|
||||
continue;
|
||||
@ -1441,8 +1441,8 @@ zfs_acl_chmod(zfsvfs_t *zfsvfs, uint64_t mode, zfs_acl_t *aclp)
|
||||
new_bytes += abstract_size;
|
||||
}
|
||||
|
||||
while (acep = zfs_acl_next_ace(aclp, acep, &who, &access_mask,
|
||||
&iflags, &type)) {
|
||||
while ((acep = zfs_acl_next_ace(aclp, acep, &who, &access_mask,
|
||||
&iflags, &type))) {
|
||||
uint16_t inherit_flags;
|
||||
|
||||
entry_type = (iflags & ACE_TYPE_FLAGS);
|
||||
@ -1584,8 +1584,8 @@ zfs_acl_inherit(zfsvfs_t *zfsvfs, vtype_t vtype, zfs_acl_t *paclp,
|
||||
aclp = zfs_acl_alloc(paclp->z_version);
|
||||
if (zfsvfs->z_acl_inherit == ZFS_ACL_DISCARD || vtype == VLNK)
|
||||
return (aclp);
|
||||
while (pacep = zfs_acl_next_ace(paclp, pacep, &who,
|
||||
&access_mask, &iflags, &type)) {
|
||||
while ((pacep = zfs_acl_next_ace(paclp, pacep, &who,
|
||||
&access_mask, &iflags, &type))) {
|
||||
|
||||
/*
|
||||
* don't inherit bogus ACEs
|
||||
@ -1837,7 +1837,7 @@ zfs_getacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
|
||||
if (mask == 0)
|
||||
return (ENOSYS);
|
||||
|
||||
if (error = zfs_zaccess(zp, ACE_READ_ACL, 0, skipaclchk, cr))
|
||||
if ((error = zfs_zaccess(zp, ACE_READ_ACL, 0, skipaclchk, cr)))
|
||||
return (error);
|
||||
|
||||
mutex_enter(&zp->z_acl_lock);
|
||||
@ -1857,8 +1857,8 @@ zfs_getacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
|
||||
uint32_t access_mask;
|
||||
uint16_t type, iflags;
|
||||
|
||||
while (zacep = zfs_acl_next_ace(aclp, zacep,
|
||||
&who, &access_mask, &iflags, &type)) {
|
||||
while ((zacep = zfs_acl_next_ace(aclp, zacep,
|
||||
&who, &access_mask, &iflags, &type))) {
|
||||
switch (type) {
|
||||
case ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE:
|
||||
case ACE_ACCESS_DENIED_OBJECT_ACE_TYPE:
|
||||
@ -1996,7 +1996,7 @@ zfs_setacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
|
||||
if (zp->z_pflags & ZFS_IMMUTABLE)
|
||||
return (EPERM);
|
||||
|
||||
if (error = zfs_zaccess(zp, ACE_WRITE_ACL, 0, skipaclchk, cr))
|
||||
if ((error = zfs_zaccess(zp, ACE_WRITE_ACL, 0, skipaclchk, cr)))
|
||||
return (error);
|
||||
|
||||
error = zfs_vsec_2_aclp(zfsvfs, ZTOV(zp)->v_type, vsecp, cr, &fuidp,
|
||||
@ -2173,8 +2173,8 @@ zfs_zaccess_aces_check(znode_t *zp, uint32_t *working_mode,
|
||||
|
||||
ASSERT(zp->z_acl_cached);
|
||||
|
||||
while (acep = zfs_acl_next_ace(aclp, acep, &who, &access_mask,
|
||||
&iflags, &type)) {
|
||||
while ((acep = zfs_acl_next_ace(aclp, acep, &who, &access_mask,
|
||||
&iflags, &type))) {
|
||||
uint32_t mask_matched;
|
||||
|
||||
if (!zfs_acl_valid_ace_type(type, iflags))
|
||||
@ -2730,14 +2730,14 @@ zfs_zaccess_rename(znode_t *sdzp, znode_t *szp, znode_t *tdzp,
|
||||
* If that succeeds then check for add_file/add_subdir permissions
|
||||
*/
|
||||
|
||||
if (error = zfs_zaccess_delete(sdzp, szp, cr))
|
||||
if ((error = zfs_zaccess_delete(sdzp, szp, cr)))
|
||||
return (error);
|
||||
|
||||
/*
|
||||
* If we have a tzp, see if we can delete it?
|
||||
*/
|
||||
if (tzp) {
|
||||
if (error = zfs_zaccess_delete(tdzp, tzp, cr))
|
||||
if ((error = zfs_zaccess_delete(tdzp, tzp, cr)))
|
||||
return (error);
|
||||
}
|
||||
|
||||
|
||||
@ -153,9 +153,9 @@ zfs_dirent_lock(zfs_dirlock_t **dlpp, znode_t *dzp, char *name, znode_t **zpp,
|
||||
/*
|
||||
* Verify that we are not trying to lock '.', '..', or '.zfs'
|
||||
*/
|
||||
if (name[0] == '.' &&
|
||||
(name[1] == '\0' || (name[1] == '.' && name[2] == '\0')) ||
|
||||
zfs_has_ctldir(dzp) && strcmp(name, ZFS_CTLDIR_NAME) == 0)
|
||||
if ((name[0] == '.' &&
|
||||
(name[1] == '\0' || (name[1] == '.' && name[2] == '\0'))) ||
|
||||
(zfs_has_ctldir(dzp) && strcmp(name, ZFS_CTLDIR_NAME) == 0))
|
||||
return (EEXIST);
|
||||
|
||||
/*
|
||||
|
||||
@ -485,8 +485,8 @@ zfs_register_callbacks(vfs_t *vfsp)
|
||||
char osname[MAXNAMELEN];
|
||||
|
||||
dmu_objset_name(os, osname);
|
||||
if (error = dsl_prop_get_integer(osname, "nbmand", &nbmand,
|
||||
NULL)) {
|
||||
if ((error = dsl_prop_get_integer(osname, "nbmand", &nbmand,
|
||||
NULL))) {
|
||||
return (error);
|
||||
}
|
||||
}
|
||||
@ -642,6 +642,8 @@ zfs_userquota_prop_to_obj(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type)
|
||||
return (zfsvfs->z_userquota_obj);
|
||||
case ZFS_PROP_GROUPQUOTA:
|
||||
return (zfsvfs->z_groupquota_obj);
|
||||
default:
|
||||
return (ENOTSUP);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
@ -873,7 +875,7 @@ zfsvfs_create(const char *osname, zfsvfs_t **zfvp)
|
||||
goto out;
|
||||
} else if (zfsvfs->z_version >
|
||||
zfs_zpl_version_map(spa_version(dmu_objset_spa(os)))) {
|
||||
(void) printf("Can't mount a version %lld file system "
|
||||
(void) printk("Can't mount a version %lld file system "
|
||||
"on a version %lld pool\n. Pool must be upgraded to mount "
|
||||
"this file system.", (u_longlong_t)zfsvfs->z_version,
|
||||
(u_longlong_t)spa_version(dmu_objset_spa(os)));
|
||||
@ -1126,8 +1128,8 @@ zfs_domount(vfs_t *vfsp, char *osname)
|
||||
}
|
||||
ASSERT(vfs_devismounted(mount_dev) == 0);
|
||||
|
||||
if (error = dsl_prop_get_integer(osname, "recordsize", &recordsize,
|
||||
NULL))
|
||||
if ((error = dsl_prop_get_integer(osname, "recordsize",
|
||||
&recordsize, NULL)))
|
||||
goto out;
|
||||
|
||||
vfsp->vfs_dev = mount_dev;
|
||||
@ -1169,7 +1171,7 @@ zfs_domount(vfs_t *vfsp, char *osname)
|
||||
|
||||
atime_changed_cb(zfsvfs, B_FALSE);
|
||||
readonly_changed_cb(zfsvfs, B_TRUE);
|
||||
if (error = dsl_prop_get_integer(osname, "xattr", &pval, NULL))
|
||||
if ((error = dsl_prop_get_integer(osname,"xattr",&pval,NULL)))
|
||||
goto out;
|
||||
xattr_changed_cb(zfsvfs, pval);
|
||||
zfsvfs->z_issnap = B_TRUE;
|
||||
@ -1565,7 +1567,7 @@ zfs_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr)
|
||||
/*
|
||||
* Get the objset name (the "special" mount argument).
|
||||
*/
|
||||
if (error = pn_get(uap->spec, fromspace, &spn))
|
||||
if ((error = pn_get(uap->spec, fromspace, &spn)))
|
||||
return (error);
|
||||
|
||||
osname = spn.pn_path;
|
||||
@ -1968,7 +1970,7 @@ zfs_vget(vfs_t *vfsp, vnode_t **vpp, fid_t *fidp)
|
||||
gen_mask = -1ULL >> (64 - 8 * i);
|
||||
|
||||
dprintf("getting %llu [%u mask %llx]\n", object, fid_gen, gen_mask);
|
||||
if (err = zfs_zget(zfsvfs, object, &zp)) {
|
||||
if ((err = zfs_zget(zfsvfs, object, &zp))) {
|
||||
ZFS_EXIT(zfsvfs);
|
||||
return (err);
|
||||
}
|
||||
|
||||
@ -450,7 +450,7 @@ zfs_read(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
|
||||
zfsvfs_t *zfsvfs = zp->z_zfsvfs;
|
||||
objset_t *os;
|
||||
ssize_t n, nbytes;
|
||||
int error;
|
||||
int error = 0;
|
||||
rl_t *rl;
|
||||
xuio_t *xuio = NULL;
|
||||
|
||||
@ -763,8 +763,8 @@ zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
|
||||
max_blksz);
|
||||
ASSERT(abuf != NULL);
|
||||
ASSERT(arc_buf_size(abuf) == max_blksz);
|
||||
if (error = uiocopy(abuf->b_data, max_blksz,
|
||||
UIO_WRITE, uio, &cbytes)) {
|
||||
if ((error = uiocopy(abuf->b_data, max_blksz,
|
||||
UIO_WRITE, uio, &cbytes))) {
|
||||
dmu_return_arcbuf(abuf);
|
||||
break;
|
||||
}
|
||||
@ -1223,7 +1223,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct pathname *pnp,
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
if (error = zfs_get_xattrdir(VTOZ(dvp), vpp, cr, flags)) {
|
||||
if ((error = zfs_get_xattrdir(VTOZ(dvp), vpp, cr, flags))) {
|
||||
ZFS_EXIT(zfsvfs);
|
||||
return (error);
|
||||
}
|
||||
@ -1232,8 +1232,8 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct pathname *pnp,
|
||||
* Do we have permission to get into attribute directory?
|
||||
*/
|
||||
|
||||
if (error = zfs_zaccess(VTOZ(*vpp), ACE_EXECUTE, 0,
|
||||
B_FALSE, cr)) {
|
||||
if ((error = zfs_zaccess(VTOZ(*vpp), ACE_EXECUTE, 0,
|
||||
B_FALSE, cr))) {
|
||||
VN_RELE(*vpp);
|
||||
*vpp = NULL;
|
||||
}
|
||||
@ -1251,7 +1251,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct pathname *pnp,
|
||||
* Check accessibility of directory.
|
||||
*/
|
||||
|
||||
if (error = zfs_zaccess(zdp, ACE_EXECUTE, 0, B_FALSE, cr)) {
|
||||
if ((error = zfs_zaccess(zdp, ACE_EXECUTE, 0, B_FALSE, cr))) {
|
||||
ZFS_EXIT(zfsvfs);
|
||||
return (error);
|
||||
}
|
||||
@ -1310,7 +1310,7 @@ zfs_create(vnode_t *dvp, char *name, vattr_t *vap, vcexcl_t excl,
|
||||
int error;
|
||||
ksid_t *ksid;
|
||||
uid_t uid;
|
||||
gid_t gid = crgetgid(cr);
|
||||
gid_t gid;
|
||||
zfs_acl_ids_t acl_ids;
|
||||
boolean_t fuid_dirtied;
|
||||
boolean_t have_acl = B_FALSE;
|
||||
@ -1320,6 +1320,7 @@ zfs_create(vnode_t *dvp, char *name, vattr_t *vap, vcexcl_t excl,
|
||||
* make sure file system is at proper version
|
||||
*/
|
||||
|
||||
gid = crgetgid(cr);
|
||||
ksid = crgetsid(cr, KSID_OWNER);
|
||||
if (ksid)
|
||||
uid = ksid_getid(ksid);
|
||||
@ -1389,7 +1390,7 @@ zfs_create(vnode_t *dvp, char *name, vattr_t *vap, vcexcl_t excl,
|
||||
* Create a new file object and update the directory
|
||||
* to reference it.
|
||||
*/
|
||||
if (error = zfs_zaccess(dzp, ACE_ADD_FILE, 0, B_FALSE, cr)) {
|
||||
if ((error = zfs_zaccess(dzp, ACE_ADD_FILE, 0, B_FALSE, cr))) {
|
||||
if (have_acl)
|
||||
zfs_acl_ids_free(&acl_ids);
|
||||
goto out;
|
||||
@ -1587,8 +1588,8 @@ zfs_remove(vnode_t *dvp, char *name, cred_t *cr, caller_context_t *ct,
|
||||
/*
|
||||
* Attempt to lock directory; fail if entry doesn't exist.
|
||||
*/
|
||||
if (error = zfs_dirent_lock(&dl, dzp, name, &zp, zflg,
|
||||
NULL, realnmp)) {
|
||||
if ((error = zfs_dirent_lock(&dl, dzp, name, &zp, zflg,
|
||||
NULL, realnmp))) {
|
||||
if (realnmp)
|
||||
pn_free(realnmp);
|
||||
ZFS_EXIT(zfsvfs);
|
||||
@ -1597,7 +1598,7 @@ zfs_remove(vnode_t *dvp, char *name, cred_t *cr, caller_context_t *ct,
|
||||
|
||||
vp = ZTOV(zp);
|
||||
|
||||
if (error = zfs_zaccess_delete(dzp, zp, cr)) {
|
||||
if ((error = zfs_zaccess_delete(dzp, zp, cr))) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
@ -1617,7 +1618,7 @@ zfs_remove(vnode_t *dvp, char *name, cred_t *cr, caller_context_t *ct,
|
||||
dnlc_remove(dvp, name);
|
||||
|
||||
mutex_enter(&vp->v_lock);
|
||||
may_delete_now = vp->v_count == 1 && !vn_has_cached_data(vp);
|
||||
may_delete_now = ((vp->v_count == 1) && (!vn_has_cached_data(vp)));
|
||||
mutex_exit(&vp->v_lock);
|
||||
|
||||
/*
|
||||
@ -1856,14 +1857,14 @@ zfs_mkdir(vnode_t *dvp, char *dirname, vattr_t *vap, vnode_t **vpp, cred_t *cr,
|
||||
top:
|
||||
*vpp = NULL;
|
||||
|
||||
if (error = zfs_dirent_lock(&dl, dzp, dirname, &zp, zf,
|
||||
NULL, NULL)) {
|
||||
if ((error = zfs_dirent_lock(&dl, dzp, dirname, &zp, zf,
|
||||
NULL, NULL))) {
|
||||
zfs_acl_ids_free(&acl_ids);
|
||||
ZFS_EXIT(zfsvfs);
|
||||
return (error);
|
||||
}
|
||||
|
||||
if (error = zfs_zaccess(dzp, ACE_ADD_SUBDIRECTORY, 0, B_FALSE, cr)) {
|
||||
if ((error = zfs_zaccess(dzp, ACE_ADD_SUBDIRECTORY, 0, B_FALSE, cr))) {
|
||||
zfs_acl_ids_free(&acl_ids);
|
||||
zfs_dirent_unlock(dl);
|
||||
ZFS_EXIT(zfsvfs);
|
||||
@ -1987,15 +1988,15 @@ zfs_rmdir(vnode_t *dvp, char *name, vnode_t *cwd, cred_t *cr,
|
||||
/*
|
||||
* Attempt to lock directory; fail if entry doesn't exist.
|
||||
*/
|
||||
if (error = zfs_dirent_lock(&dl, dzp, name, &zp, zflg,
|
||||
NULL, NULL)) {
|
||||
if ((error = zfs_dirent_lock(&dl, dzp, name, &zp, zflg,
|
||||
NULL, NULL))) {
|
||||
ZFS_EXIT(zfsvfs);
|
||||
return (error);
|
||||
}
|
||||
|
||||
vp = ZTOV(zp);
|
||||
|
||||
if (error = zfs_zaccess_delete(dzp, zp, cr)) {
|
||||
if ((error = zfs_zaccess_delete(dzp, zp, cr))) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
@ -2442,8 +2443,8 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr,
|
||||
*/
|
||||
if (!(zp->z_pflags & ZFS_ACL_TRIVIAL) &&
|
||||
(vap->va_uid != crgetuid(cr))) {
|
||||
if (error = zfs_zaccess(zp, ACE_READ_ATTRIBUTES, 0,
|
||||
skipaclchk, cr)) {
|
||||
if ((error = zfs_zaccess(zp, ACE_READ_ATTRIBUTES, 0,
|
||||
skipaclchk, cr))) {
|
||||
ZFS_EXIT(zfsvfs);
|
||||
return (error);
|
||||
}
|
||||
@ -3520,7 +3521,7 @@ zfs_rename(vnode_t *sdvp, char *snm, vnode_t *tdvp, char *tnm, cred_t *cr,
|
||||
* done in a single check.
|
||||
*/
|
||||
|
||||
if (error = zfs_zaccess_rename(sdzp, szp, tdzp, tzp, cr))
|
||||
if ((error = zfs_zaccess_rename(sdzp, szp, tdzp, tzp, cr)))
|
||||
goto out;
|
||||
|
||||
if (ZTOV(szp)->v_type == VDIR) {
|
||||
@ -3528,7 +3529,7 @@ zfs_rename(vnode_t *sdvp, char *snm, vnode_t *tdvp, char *tnm, cred_t *cr,
|
||||
* Check to make sure rename is valid.
|
||||
* Can't do a move like this: /usr/a/b to /usr/a/b/c/d
|
||||
*/
|
||||
if (error = zfs_rename_lock(szp, tdzp, sdzp, &zl))
|
||||
if ((error = zfs_rename_lock(szp, tdzp, sdzp, &zl)))
|
||||
goto out;
|
||||
}
|
||||
|
||||
@ -3746,7 +3747,7 @@ zfs_symlink(vnode_t *dvp, char *name, vattr_t *vap, char *link, cred_t *cr,
|
||||
return (error);
|
||||
}
|
||||
|
||||
if (error = zfs_zaccess(dzp, ACE_ADD_FILE, 0, B_FALSE, cr)) {
|
||||
if ((error = zfs_zaccess(dzp, ACE_ADD_FILE, 0, B_FALSE, cr))) {
|
||||
zfs_acl_ids_free(&acl_ids);
|
||||
zfs_dirent_unlock(dl);
|
||||
ZFS_EXIT(zfsvfs);
|
||||
@ -3969,7 +3970,7 @@ zfs_link(vnode_t *tdvp, vnode_t *svp, char *name, cred_t *cr,
|
||||
return (EPERM);
|
||||
}
|
||||
|
||||
if (error = zfs_zaccess(dzp, ACE_ADD_FILE, 0, B_FALSE, cr)) {
|
||||
if ((error = zfs_zaccess(dzp, ACE_ADD_FILE, 0, B_FALSE, cr))) {
|
||||
ZFS_EXIT(zfsvfs);
|
||||
return (error);
|
||||
}
|
||||
@ -4727,7 +4728,7 @@ zfs_space(vnode_t *vp, int cmd, flock64_t *bfp, int flag,
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
if (error = convoff(vp, bfp, 0, offset)) {
|
||||
if ((error = convoff(vp, bfp, 0, offset))) {
|
||||
ZFS_EXIT(zfsvfs);
|
||||
return (error);
|
||||
}
|
||||
|
||||
@ -1000,7 +1000,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
|
||||
if (obj_type == DMU_OT_ZNODE ||
|
||||
acl_ids->z_aclp->z_version < ZFS_ACL_VERSION_FUID) {
|
||||
err = zfs_aclset_common(*zpp, acl_ids->z_aclp, cr, tx);
|
||||
ASSERT3P(err, ==, 0);
|
||||
ASSERT3S(err, ==, 0);
|
||||
}
|
||||
ZFS_OBJ_HOLD_EXIT(zfsvfs, obj);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user