/*
- * Copyright (c) 2006-2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2019 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
+ *
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
* unlawful or unlicensed copies of an Apple operating system, or to
* circumvent, violate, or enable the circumvention or violation of, any
* terms of an Apple operating system software license agreement.
- *
+ *
* Please obtain a copy of the License at
* http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
+ *
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
* Please see the License for the specific language governing rights and
* limitations under the License.
- *
+ *
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
#include <kern/task.h>
#include <kern/sched_prim.h>
+#if CONFIG_NFS4
int
nfs4_access_rpc(nfsnode_t np, u_int32_t *access, int rpcflags, vfs_context_t ctx)
{
uid_t uid;
struct nfsreq_secinfo_args si;
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (0);
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return 0;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND,
- vfs_context_thread(ctx), vfs_context_ucred(ctx),
- &si, rpcflags, &nmrep, &xid, &status);
+ vfs_context_thread(ctx), vfs_context_ucred(ctx),
+ &si, rpcflags, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
/* ".zfs" subdirectories may erroneously give a denied answer for modify/delete */
if (nfs_access_dotzfs) {
vnode_t dvp = NULLVP;
- if (np->n_flag & NISDOTZFSCHILD) /* may be able to create/delete snapshot dirs */
- access_result |= (NFS_ACCESS_MODIFY|NFS_ACCESS_EXTEND|NFS_ACCESS_DELETE);
- else if (((dvp = vnode_getparent(NFSTOV(np))) != NULLVP) && (VTONFS(dvp)->n_flag & NISDOTZFSCHILD))
+ if (np->n_flag & NISDOTZFSCHILD) { /* may be able to create/delete snapshot dirs */
+ access_result |= (NFS_ACCESS_MODIFY | NFS_ACCESS_EXTEND | NFS_ACCESS_DELETE);
+ } else if (((dvp = vnode_getparent(NFSTOV(np))) != NULLVP) && (VTONFS(dvp)->n_flag & NISDOTZFSCHILD)) {
access_result |= NFS_ACCESS_DELETE; /* may be able to delete snapshot dirs */
- if (dvp != NULLVP)
+ }
+ if (dvp != NULLVP) {
vnode_put(dvp);
+ }
}
/* Some servers report DELETE support but erroneously give a denied answer. */
- if (nfs_access_delete && (*access & NFS_ACCESS_DELETE) && !(access_result & NFS_ACCESS_DELETE))
+ if (nfs_access_delete && (*access & NFS_ACCESS_DELETE) && !(access_result & NFS_ACCESS_DELETE)) {
access_result |= NFS_ACCESS_DELETE;
+ }
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
nfsmout_if(error);
- uid = kauth_cred_getuid(vfs_context_ucred(ctx));
+ if (nfs_mount_gone(nmp)) {
+ error = ENXIO;
+ }
+ nfsmout_if(error);
+
+ if (auth_is_kerberized(np->n_auth) || auth_is_kerberized(nmp->nm_auth)) {
+ uid = nfs_cred_getasid2uid(vfs_context_ucred(ctx));
+ } else {
+ uid = kauth_cred_getuid(vfs_context_ucred(ctx));
+ }
slot = nfs_node_access_slot(np, uid, 1);
np->n_accessuid[slot] = uid;
microuptime(&now);
/* pass back the access returned with this request */
*access = np->n_access[slot];
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
int
struct nfsm_chain nmreq, nmrep;
struct nfsreq_secinfo_args si;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
acls = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_ACL);
if (np && (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)) {
nfs4_default_attrs_for_referral_trigger(VTONFS(np->n_parent), NULL, 0, nvap, NULL);
- return (0);
+ return 0;
}
- if (flags & NGA_MONITOR) /* vnode monitor requests should be soft */
+ if (flags & NGA_MONITOR) { /* vnode monitor requests should be soft */
rpcflags = R_RECOVER;
+ }
- if (flags & NGA_SOFT) /* Return ETIMEDOUT if server not responding */
+ if (flags & NGA_SOFT) { /* Return ETIMEDOUT if server not responding */
rpcflags |= R_SOFT;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
numops--;
nfsm_chain_add_32(error, &nmreq, NFS_OP_GETATTR);
NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
- if ((flags & NGA_ACL) && acls)
+ if ((flags & NGA_ACL) && acls) {
NFS_BITMAP_SET(bitmap, NFS_FATTR_ACL);
+ }
nfsm_chain_add_bitmap_supported(error, &nmreq, bitmap, nmp, np);
nfsm_chain_build_done(error, &nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
- error = nfs_request2(np, mp, &nmreq, NFSPROC4_COMPOUND,
- vfs_context_thread(ctx), vfs_context_ucred(ctx),
- NULL, rpcflags, &nmrep, xidp, &status);
+ error = nfs_request2(np, mp, &nmreq, NFSPROC4_COMPOUND,
+ vfs_context_thread(ctx), vfs_context_ucred(ctx),
+ NULL, rpcflags, &nmrep, xidp, &status);
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsmout:
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
int
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
nfsm_chain_null(&nmrep);
nfsmout_if(error);
error = nfs_request(np, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_get_32(error, &nmrep, len);
nfsmout_if(error);
if (len >= *buflenp) {
- if (np->n_size && (np->n_size < *buflenp))
+ if (np->n_size && (np->n_size < *buflenp)) {
len = np->n_size;
- else
+ } else {
len = *buflenp - 1;
+ }
}
nfsm_chain_get_opaque(error, &nmrep, len, buf);
- if (!error)
+ if (!error) {
*buflenp = len;
+ }
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
int
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
error = nfs_request_async(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, 0, cb, reqp);
nfsmout:
nfsm_chain_cleanup(&nmreq);
- return (error);
+ return error;
}
int
nmp = NFSTONMP(np);
if (nfs_mount_gone(nmp)) {
nfs_request_async_cancel(req);
- return (ENXIO);
+ return ENXIO;
}
nfsvers = nmp->nm_vers;
nfsm_chain_null(&nmrep);
error = nfs_request_async_finish(req, &nmrep, &xid, &status);
- if (error == EINPROGRESS) /* async request restarted */
- return (error);
+ if (error == EINPROGRESS) { /* async request restarted */
+ return error;
+ }
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
}
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
if (eofp) {
- if (!eof && !retlen)
+ if (!eof && !retlen) {
eof = 1;
+ }
*eofp = eof;
}
nfsm_chain_cleanup(&nmrep);
- if (np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)
+ if (np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) {
microuptime(&np->n_lastio);
- return (error);
+ }
+ return error;
}
int
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
/* for async mounts, don't bother sending sync write requests */
if ((iomode != NFS_WRITE_UNSTABLE) && nfs_allow_async &&
- ((mp = NFSTOMP(np))) && (vfs_flags(mp) & MNT_ASYNC))
+ ((mp = NFSTOMP(np))) && (vfs_flags(mp) & MNT_ASYNC)) {
iomode = NFS_WRITE_UNSTABLE;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
nfsm_chain_add_64(error, &nmreq, uio_offset(uio));
nfsm_chain_add_32(error, &nmreq, iomode);
nfsm_chain_add_32(error, &nmreq, len);
- if (!error)
+ if (!error) {
error = nfsm_chain_add_uio(&nmreq, uio, len);
+ }
numops--;
nfsm_chain_add_32(error, &nmreq, NFS_OP_GETATTR);
nfsm_chain_add_bitmap_supported(error, &nmreq, nfs_getattr_bitmap, nmp, np);
error = nfs_request_async(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, 0, cb, reqp);
nfsmout:
nfsm_chain_cleanup(&nmreq);
- return (error);
+ return error;
}
int
nmp = NFSTONMP(np);
if (nfs_mount_gone(nmp)) {
nfs_request_async_cancel(req);
- return (ENXIO);
+ return ENXIO;
}
nfsvers = nmp->nm_vers;
nfsm_chain_null(&nmrep);
error = nfs_request_async_finish(req, &nmrep, &xid, &status);
- if (error == EINPROGRESS) /* async request restarted */
- return (error);
+ if (error == EINPROGRESS) { /* async request restarted */
+ return error;
+ }
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
+ if (nfs_mount_gone(nmp)) {
error = ENXIO;
- if (!error && (lockerror = nfs_node_lock(np)))
+ }
+ if (!error && (lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_get_32(error, &nmrep, rlen);
nfsmout_if(error);
*rlenp = rlen;
- if (rlen <= 0)
+ if (rlen <= 0) {
error = NFSERR_IO;
+ }
nfsm_chain_get_32(error, &nmrep, committed);
nfsm_chain_get_64(error, &nmrep, wverf);
nfsmout_if(error);
- if (wverfp)
+ if (wverfp) {
*wverfp = wverf;
+ }
lck_mtx_lock(&nmp->nm_lock);
if (!(nmp->nm_state & NFSSTA_HASWRITEVERF)) {
nmp->nm_verf = wverf;
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfsm_chain_cleanup(&nmrep);
if ((committed != NFS_WRITE_FILESYNC) && nfs_allow_async &&
- ((mp = NFSTOMP(np))) && (vfs_flags(mp) & MNT_ASYNC))
+ ((mp = NFSTOMP(np))) && (vfs_flags(mp) & MNT_ASYNC)) {
committed = NFS_WRITE_FILESYNC;
+ }
*iomodep = committed;
- if (np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)
+ if (np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) {
microuptime(&np->n_lastio);
- return (error);
+ }
+ return error;
}
int
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(dnp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
NFSREQ_SECINFO_SET(&si, dnp, NULL, 0, NULL, 0);
restart:
nfsm_chain_null(&nmreq);
error = nfs_request2(dnp, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, 0, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(dnp)))
+ if ((lockerror = nfs_node_lock(dnp))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_check_change_info(error, &nmrep, dnp);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, dnp, nfsvers, &xid);
- if (error && !lockerror)
+ if (error && !lockerror) {
NATTRINVALIDATE(dnp);
+ }
nfsmout:
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
nfs_node_unlock(dnp);
}
if (error == NFSERR_GRACE) {
- tsleep(&nmp->nm_state, (PZERO-1), "nfsgrace", 2*hz);
+ tsleep(&nmp->nm_state, (PZERO - 1), "nfsgrace", 2 * hz);
goto restart;
}
- return (remove_error);
+ return remove_error;
}
int
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(fdnp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if (fdnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
- if (tdnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (fdnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
+ if (tdnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
NFSREQ_SECINFO_SET(&si, fdnp, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
error = nfs_request(fdnp, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock2(fdnp, tdnp)))
+ if ((lockerror = nfs_node_lock2(fdnp, tdnp))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
savedxid = xid;
nfsm_chain_loadattr(error, &nmrep, tdnp, nfsvers, &xid);
- if (error && !lockerror)
+ if (error && !lockerror) {
NATTRINVALIDATE(tdnp);
+ }
nfsm_chain_op_check(error, &nmrep, NFS_OP_RESTOREFH);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
xid = savedxid;
nfsm_chain_loadattr(error, &nmrep, fdnp, nfsvers, &xid);
- if (error && !lockerror)
+ if (error && !lockerror) {
NATTRINVALIDATE(fdnp);
+ }
nfsmout:
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
tdnp->n_flag |= NMODIFIED;
nfs_node_unlock2(fdnp, tdnp);
}
- return (error);
+ return error;
}
/*
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(dnp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
nmreaddirsize = nmp->nm_readdirsize;
nmrsize = nmp->nm_rsize;
bigcookies = nmp->nm_state & NFSSTA_BIGCOOKIES;
namedattr = (dnp->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) ? 1 : 0;
rdirplus = (NMFLAG(nmp, RDIRPLUS) || namedattr) ? 1 : 0;
- if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
NFSREQ_SECINFO_SET(&si, dnp, NULL, 0, NULL, 0);
/*
NFS_BITMAP_SET(entry_attrs, NFS_FATTR_RDATTR_ERROR);
/* lock to protect access to cookie verifier */
- if ((lockerror = nfs_node_lock(dnp)))
- return (lockerror);
+ if ((lockerror = nfs_node_lock(dnp))) {
+ return lockerror;
+ }
/* determine cookie to use, and move dp to the right offset */
ndbhp = (struct nfs_dir_buf_header*)bp->nb_data;
dp = NFS_DIR_BUF_FIRST_DIRENTRY(bp);
if (ndbhp->ndbh_count) {
- for (i=0; i < ndbhp->ndbh_count-1; i++)
+ for (i = 0; i < ndbhp->ndbh_count - 1; i++) {
dp = NFS_DIRENTRY_NEXT(dp);
+ }
cookie = dp->d_seekoff;
dp = NFS_DIRENTRY_NEXT(dp);
} else {
/* "." */
namlen = 1;
reclen = NFS_DIRENTRY_LEN(namlen + xlen);
- if (xlen)
- bzero(&dp->d_name[namlen+1], xlen);
+ if (xlen) {
+ bzero(&dp->d_name[namlen + 1], xlen);
+ }
dp->d_namlen = namlen;
- strlcpy(dp->d_name, ".", namlen+1);
+ strlcpy(dp->d_name, ".", namlen + 1);
dp->d_fileno = dnp->n_vattr.nva_fileid;
dp->d_type = DT_DIR;
dp->d_reclen = reclen;
padstart = dp->d_name + dp->d_namlen + 1 + xlen;
dp = NFS_DIRENTRY_NEXT(dp);
padlen = (char*)dp - padstart;
- if (padlen > 0)
+ if (padlen > 0) {
bzero(padstart, padlen);
- if (rdirplus) /* zero out attributes */
+ }
+ if (rdirplus) { /* zero out attributes */
bzero(NFS_DIR_BUF_NVATTR(bp, 0), sizeof(struct nfs_vattr));
+ }
/* ".." */
namlen = 2;
reclen = NFS_DIRENTRY_LEN(namlen + xlen);
- if (xlen)
- bzero(&dp->d_name[namlen+1], xlen);
+ if (xlen) {
+ bzero(&dp->d_name[namlen + 1], xlen);
+ }
dp->d_namlen = namlen;
- strlcpy(dp->d_name, "..", namlen+1);
- if (dnp->n_parent)
+ strlcpy(dp->d_name, "..", namlen + 1);
+ if (dnp->n_parent) {
dp->d_fileno = VTONFS(dnp->n_parent)->n_vattr.nva_fileid;
- else
+ } else {
dp->d_fileno = dnp->n_vattr.nva_fileid;
+ }
dp->d_type = DT_DIR;
dp->d_reclen = reclen;
dp->d_seekoff = 2;
padstart = dp->d_name + dp->d_namlen + 1 + xlen;
dp = NFS_DIRENTRY_NEXT(dp);
padlen = (char*)dp - padstart;
- if (padlen > 0)
+ if (padlen > 0) {
bzero(padstart, padlen);
- if (rdirplus) /* zero out attributes */
+ }
+ if (rdirplus) { /* zero out attributes */
bzero(NFS_DIR_BUF_NVATTR(bp, 1), sizeof(struct nfs_vattr));
+ }
ndbhp->ndbh_entry_end = (char*)dp - bp->nb_data;
ndbhp->ndbh_count = 2;
nfsm_chain_null(&nmreq);
nfsm_chain_null(&nmrep);
while (nfs_dir_buf_freespace(bp, rdirplus) && !(ndbhp->ndbh_flags & NDB_FULL)) {
-
// PUTFH, GETATTR, READDIR
numops = 3;
nfsm_chain_build_alloc_init(error, &nmreq, 26 * NFSX_UNSIGNED);
nfsmout_if(error);
error = nfs_request(dnp, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(dnp)))
+ if ((lockerror = nfs_node_lock(dnp))) {
error = lockerror;
+ }
savedxid = xid;
nfsm_chain_skip_tag(error, &nmrep);
}
nfsmout_if(error);
- if (rdirplus)
+ if (rdirplus) {
microuptime(&now);
+ }
/* loop through the entries packing them into the buffer */
while (more_entries) {
error = EBADRPC;
goto nfsmout;
}
- if (namlen > (sizeof(dp->d_name)-1)) {
+ if (namlen > (sizeof(dp->d_name) - 1)) {
skiplen = namlen - sizeof(dp->d_name) + 1;
namlen = sizeof(dp->d_name) - 1;
} else {
nfsm_chain_get_opaque(error, &nmrep, namlen, dp->d_name);
nfsmout_if(error);
dp->d_name[namlen] = '\0';
- if (skiplen)
+ if (skiplen) {
nfsm_chain_adv(error, &nmrep,
- nfsm_rndup(namlen + skiplen) - nfsm_rndup(namlen));
+ nfsm_rndup(namlen + skiplen) - nfsm_rndup(namlen));
+ }
nfsmout_if(error);
nvattrp = rdirplus ? NFS_DIR_BUF_NVATTR(bp, ndbhp->ndbh_count) : &nvattr;
error = nfs4_parsefattr(&nmrep, NULL, nvattrp, &fh, NULL, NULL);
continue;
}
- if (NFS_BITMAP_ISSET(nvattrp->nva_bitmap, NFS_FATTR_TYPE))
+ if (NFS_BITMAP_ISSET(nvattrp->nva_bitmap, NFS_FATTR_TYPE)) {
dp->d_type = IFTODT(VTTOIF(nvattrp->nva_type));
- if (NFS_BITMAP_ISSET(nvattrp->nva_bitmap, NFS_FATTR_FILEID))
+ }
+ if (NFS_BITMAP_ISSET(nvattrp->nva_bitmap, NFS_FATTR_FILEID)) {
dp->d_fileno = nvattrp->nva_fileid;
+ }
if (rdirplus) {
/* fileid is already in d_fileno, so stash xid in attrs */
nvattrp->nva_fileid = savedxid;
goto nextbuffer;
}
/* pack the file handle into the record */
- dp->d_name[dp->d_namlen+1] = fh.fh_len;
- bcopy(fh.fh_data, &dp->d_name[dp->d_namlen+2], fh.fh_len);
+ dp->d_name[dp->d_namlen + 1] = fh.fh_len;
+ bcopy(fh.fh_data, &dp->d_name[dp->d_namlen + 2], fh.fh_len);
} else {
/* mark the file handle invalid */
fh.fh_len = 0;
fhlen = fh.fh_len + 1;
xlen = fhlen + sizeof(time_t);
reclen = NFS_DIRENTRY_LEN(namlen + xlen);
- bzero(&dp->d_name[dp->d_namlen+1], fhlen);
+ bzero(&dp->d_name[dp->d_namlen + 1], fhlen);
}
- *(time_t*)(&dp->d_name[dp->d_namlen+1+fhlen]) = now.tv_sec;
+ *(time_t*)(&dp->d_name[dp->d_namlen + 1 + fhlen]) = now.tv_sec;
dp->d_reclen = reclen;
}
padstart = dp->d_name + dp->d_namlen + 1 + xlen;
ndbhp->ndbh_entry_end = (char*)dp - bp->nb_data;
/* zero out the pad bytes */
padlen = (char*)dp - padstart;
- if (padlen > 0)
+ if (padlen > 0) {
bzero(padstart, padlen);
+ }
}
/* Finally, get the eof boolean */
nfsm_chain_get_32(error, &nmrep, eof);
nfsmout_if(error);
if (eof) {
- ndbhp->ndbh_flags |= (NDB_FULL|NDB_EOF);
+ ndbhp->ndbh_flags |= (NDB_FULL | NDB_EOF);
nfs_node_lock_force(dnp);
dnp->n_eofcookie = lastcookie;
nfs_node_unlock(dnp);
bp = NULL;
break;
}
- if ((lockerror = nfs_node_lock(dnp)))
+ if ((lockerror = nfs_node_lock(dnp))) {
error = lockerror;
+ }
nfsmout_if(error);
nfsm_chain_cleanup(&nmrep);
nfsm_chain_null(&nmreq);
}
nfsmout:
- if (bp_dropped && bp)
+ if (bp_dropped && bp) {
nfs_buf_release(bp, 0);
- if (!lockerror)
+ }
+ if (!lockerror) {
nfs_node_unlock(dnp);
+ }
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (bp_dropped ? NFSERR_DIRBUFDROPPED : error);
+ return bp_dropped ? NFSERR_DIRBUFDROPPED : error;
}
int
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(dnp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
if ((name[0] == '.') && (name[1] == '.') && (namelen == 2)) {
isdotdot = 1;
nfsm_chain_add_32(error, &nmreq, NFS_OP_GETATTR);
NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
/* some ".zfs" directories can't handle being asked for some attributes */
- if ((dnp->n_flag & NISDOTZFS) && !isdotdot)
+ if ((dnp->n_flag & NISDOTZFS) && !isdotdot) {
NFS_BITMAP_CLR(bitmap, NFS_FATTR_NAMED_ATTR);
- if ((dnp->n_flag & NISDOTZFSCHILD) && isdotdot)
+ }
+ if ((dnp->n_flag & NISDOTZFSCHILD) && isdotdot) {
NFS_BITMAP_CLR(bitmap, NFS_FATTR_NAMED_ATTR);
- if (((namelen == 4) && (name[0] == '.') && (name[1] == 'z') && (name[2] == 'f') && (name[3] == 's')))
+ }
+ if (((namelen == 4) && (name[0] == '.') && (name[1] == 'z') && (name[2] == 'f') && (name[3] == 's'))) {
NFS_BITMAP_CLR(bitmap, NFS_FATTR_NAMED_ATTR);
+ }
nfsm_chain_add_bitmap_supported(error, &nmreq, bitmap, nmp, NULL);
nfsm_chain_build_done(error, &nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
error = nfs_request_async(dnp, NULL, &nmreq, NFSPROC4_COMPOUND,
- vfs_context_thread(ctx), vfs_context_ucred(ctx), &si, 0, NULL, reqp);
+ vfs_context_thread(ctx), vfs_context_ucred(ctx), &si, 0, NULL, reqp);
nfsmout:
nfsm_chain_cleanup(&nmreq);
- return (error);
+ return error;
}
struct nfsm_chain nmrep;
nmp = NFSTONMP(dnp);
- if (nmp == NULL)
- return (ENXIO);
+ if (nmp == NULL) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if ((name[0] == '.') && (name[1] == '.') && (namelen == 2))
+ if ((name[0] == '.') && (name[1] == '.') && (namelen == 2)) {
isdotdot = 1;
+ }
nfsm_chain_null(&nmrep);
error = nfs_request_async_finish(req, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(dnp)))
+ if ((lockerror = nfs_node_lock(dnp))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
- if (xidp)
+ if (xidp) {
*xidp = xid;
+ }
nfsm_chain_loadattr(error, &nmrep, dnp, nfsvers, &xid);
nfsm_chain_op_check(error, &nmrep, (isdotdot ? NFS_OP_LOOKUPP : NFS_OP_LOOKUP));
nfsmout_if(error || !fhp || !nvap);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETFH);
nfsm_chain_get_32(error, &nmrep, fhp->fh_len);
+ if (error == 0 && fhp->fh_len > sizeof(fhp->fh_data)) {
+ error = EBADRPC;
+ }
+ nfsmout_if(error);
nfsm_chain_get_opaque(error, &nmrep, fhp->fh_len, fhp->fh_data);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
if ((error == NFSERR_MOVED) || (error == NFSERR_INVAL)) {
error = nfs4_parsefattr(&nmrep, NULL, nvap, NULL, NULL, NULL);
}
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(dnp);
+ }
nfsm_chain_cleanup(&nmrep);
if (!error && (op == NFS_OP_LOOKUP) && (nmp->nm_state & NFSSTA_NEEDSECINFO)) {
/* We still need to get SECINFO to set default for mount. */
sec.count = NX_MAX_SEC_FLAVORS;
error = nfs4_secinfo_rpc(nmp, &req->r_secinfo, vfs_context_ucred(ctx), sec.flavors, &sec.count);
/* [sigh] some implementations return "illegal" error for unsupported ops */
- if (error == NFSERR_OP_ILLEGAL)
+ if (error == NFSERR_OP_ILLEGAL) {
error = 0;
+ }
if (!error) {
/* set our default security flavor to the first in the list */
lck_mtx_lock(&nmp->nm_lock);
- if (sec.count)
+ if (sec.count) {
nmp->nm_auth = sec.flavors[0];
+ }
nmp->nm_state &= ~NFSSTA_NEEDSECINFO;
lck_mtx_unlock(&nmp->nm_lock);
}
}
- return (error);
+ return error;
}
int
nmp = NFSTONMP(np);
FSDBG(521, np, offset, count, nmp ? nmp->nm_state : 0);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
- if (!(nmp->nm_state & NFSSTA_HASWRITEVERF))
- return (0);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
+ if (!(nmp->nm_state & NFSSTA_HASWRITEVERF)) {
+ return 0;
+ }
nfsvers = nmp->nm_vers;
- if (count > UINT32_MAX)
+ if (count > UINT32_MAX) {
count32 = 0;
- else
+ } else {
count32 = count;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND,
- current_thread(), cred, &si, 0, &nmrep, &xid, &status);
+ current_thread(), cred, &si, 0, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_get_64(error, &nmrep, newwverf);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfsmout_if(error);
lck_mtx_lock(&nmp->nm_lock);
- if (nmp->nm_verf != newwverf)
+ if (nmp->nm_verf != newwverf) {
nmp->nm_verf = newwverf;
- if (wverf != newwverf)
+ }
+ if (wverf != newwverf) {
error = NFSERR_STALEWRITEVERF;
+ }
lck_mtx_unlock(&nmp->nm_lock);
nfsmout:
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
int
struct nfs_vattr nvattr;
struct nfsreq_secinfo_args si;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
NVATTR_INIT(&nvattr);
nfsmout_if(error);
error = nfs4_parsefattr(&nmrep, nfsap, &nvattr, NULL, NULL, NULL);
nfsmout_if(error);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
- if (!error)
+ }
+ if (!error) {
nfs_loadattrcache(np, &nvattr, &xid, 0);
- if (!lockerror)
+ }
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfsmout:
NVATTR_CLEANUP(&nvattr);
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
int
nfs4_vnop_getattr(
struct vnop_getattr_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- struct vnode_attr *a_vap;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * struct vnode_attr *a_vap;
+ * vfs_context_t a_context;
+ * } */*ap)
{
struct vnode_attr *vap = ap->a_vap;
struct nfsmount *nmp;
int error, acls, ngaflags;
nmp = VTONMP(ap->a_vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
acls = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_ACL);
ngaflags = NGA_CACHED;
- if (VATTR_IS_ACTIVE(vap, va_acl) && acls)
+ if (VATTR_IS_ACTIVE(vap, va_acl) && acls) {
ngaflags |= NGA_ACL;
+ }
error = nfs_getattr(VTONFS(ap->a_vp), &nva, ap->a_context, ngaflags);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
/* copy what we have in nva to *a_vap */
if (VATTR_IS_ACTIVE(vap, va_rdev) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_RAWDEV)) {
dev_t rdev = makedev(nva.nva_rawdev.specdata1, nva.nva_rawdev.specdata2);
VATTR_RETURN(vap, va_rdev, rdev);
}
- if (VATTR_IS_ACTIVE(vap, va_nlink) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_NUMLINKS))
+ if (VATTR_IS_ACTIVE(vap, va_nlink) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_NUMLINKS)) {
VATTR_RETURN(vap, va_nlink, nva.nva_nlink);
- if (VATTR_IS_ACTIVE(vap, va_data_size) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_SIZE))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_data_size) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_SIZE)) {
VATTR_RETURN(vap, va_data_size, nva.nva_size);
+ }
// VATTR_RETURN(vap, va_data_alloc, ???);
// VATTR_RETURN(vap, va_total_size, ???);
- if (VATTR_IS_ACTIVE(vap, va_total_alloc) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_SPACE_USED))
+ if (VATTR_IS_ACTIVE(vap, va_total_alloc) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_SPACE_USED)) {
VATTR_RETURN(vap, va_total_alloc, nva.nva_bytes);
- if (VATTR_IS_ACTIVE(vap, va_uid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_OWNER))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_uid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_OWNER)) {
VATTR_RETURN(vap, va_uid, nva.nva_uid);
- if (VATTR_IS_ACTIVE(vap, va_uuuid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_OWNER))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_uuuid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_OWNER)) {
VATTR_RETURN(vap, va_uuuid, nva.nva_uuuid);
- if (VATTR_IS_ACTIVE(vap, va_gid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_OWNER_GROUP))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_gid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_OWNER_GROUP)) {
VATTR_RETURN(vap, va_gid, nva.nva_gid);
- if (VATTR_IS_ACTIVE(vap, va_guuid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_OWNER_GROUP))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_guuid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_OWNER_GROUP)) {
VATTR_RETURN(vap, va_guuid, nva.nva_guuid);
+ }
if (VATTR_IS_ACTIVE(vap, va_mode)) {
- if (NMFLAG(nmp, ACLONLY) || !NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_MODE))
+ if (NMFLAG(nmp, ACLONLY) || !NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_MODE)) {
VATTR_RETURN(vap, va_mode, 0777);
- else
+ } else {
VATTR_RETURN(vap, va_mode, nva.nva_mode);
+ }
}
if (VATTR_IS_ACTIVE(vap, va_flags) &&
(NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_ARCHIVE) ||
- NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_HIDDEN) ||
- (nva.nva_flags & NFS_FFLAG_TRIGGER))) {
+ NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_HIDDEN) ||
+ (nva.nva_flags & NFS_FFLAG_TRIGGER))) {
uint32_t flags = 0;
if (NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_ARCHIVE) &&
- (nva.nva_flags & NFS_FFLAG_ARCHIVED))
+ (nva.nva_flags & NFS_FFLAG_ARCHIVED)) {
flags |= SF_ARCHIVED;
+ }
if (NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_HIDDEN) &&
- (nva.nva_flags & NFS_FFLAG_HIDDEN))
+ (nva.nva_flags & NFS_FFLAG_HIDDEN)) {
flags |= UF_HIDDEN;
+ }
VATTR_RETURN(vap, va_flags, flags);
}
if (VATTR_IS_ACTIVE(vap, va_create_time) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_TIME_CREATE)) {
vap->va_backup_time.tv_nsec = nva.nva_timensec[NFSTIME_BACKUP];
VATTR_SET_SUPPORTED(vap, va_backup_time);
}
- if (VATTR_IS_ACTIVE(vap, va_fileid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_FILEID))
+ if (VATTR_IS_ACTIVE(vap, va_fileid) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_FILEID)) {
VATTR_RETURN(vap, va_fileid, nva.nva_fileid);
- if (VATTR_IS_ACTIVE(vap, va_type) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_TYPE))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_type) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_TYPE)) {
VATTR_RETURN(vap, va_type, nva.nva_type);
- if (VATTR_IS_ACTIVE(vap, va_filerev) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_CHANGE))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_filerev) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_CHANGE)) {
VATTR_RETURN(vap, va_filerev, nva.nva_change);
+ }
if (VATTR_IS_ACTIVE(vap, va_acl) && acls) {
VATTR_RETURN(vap, va_acl, nva.nva_acl);
// VATTR_RETURN(vap, va_encoding, ??? /* potentially unnormalized UTF-8? */);
NVATTR_CLEANUP(&nva);
- return (error);
+ return error;
}
int
nfs_stateid stateid;
struct nfsreq_secinfo_args si;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
- if (VATTR_IS_ACTIVE(vap, va_flags) && (vap->va_flags & ~(SF_ARCHIVED|UF_HIDDEN))) {
+ if (VATTR_IS_ACTIVE(vap, va_flags) && (vap->va_flags & ~(SF_ARCHIVED | UF_HIDDEN))) {
/* we don't support setting unsupported flags (duh!) */
- if (vap->va_active & ~VNODE_ATTR_va_flags)
- return (EINVAL); /* return EINVAL if other attributes also set */
- else
- return (ENOTSUP); /* return ENOTSUP for chflags(2) */
+ if (vap->va_active & ~VNODE_ATTR_va_flags) {
+ return EINVAL; /* return EINVAL if other attributes also set */
+ } else {
+ return ENOTSUP; /* return ENOTSUP for chflags(2) */
+ }
}
/* don't bother requesting some changes if they don't look like they are changing */
- if (VATTR_IS_ACTIVE(vap, va_uid) && (vap->va_uid == np->n_vattr.nva_uid))
+ if (VATTR_IS_ACTIVE(vap, va_uid) && (vap->va_uid == np->n_vattr.nva_uid)) {
VATTR_CLEAR_ACTIVE(vap, va_uid);
- if (VATTR_IS_ACTIVE(vap, va_gid) && (vap->va_gid == np->n_vattr.nva_gid))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_gid) && (vap->va_gid == np->n_vattr.nva_gid)) {
VATTR_CLEAR_ACTIVE(vap, va_gid);
- if (VATTR_IS_ACTIVE(vap, va_uuuid) && kauth_guid_equal(&vap->va_uuuid, &np->n_vattr.nva_uuuid))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_uuuid) && kauth_guid_equal(&vap->va_uuuid, &np->n_vattr.nva_uuuid)) {
VATTR_CLEAR_ACTIVE(vap, va_uuuid);
- if (VATTR_IS_ACTIVE(vap, va_guuid) && kauth_guid_equal(&vap->va_guuid, &np->n_vattr.nva_guuid))
+ }
+ if (VATTR_IS_ACTIVE(vap, va_guuid) && kauth_guid_equal(&vap->va_guuid, &np->n_vattr.nva_guuid)) {
VATTR_CLEAR_ACTIVE(vap, va_guuid);
+ }
tryagain:
/* do nothing if no attributes will be sent */
nfs_vattr_set_bitmap(nmp, bitmap, vap);
- if (!bitmap[0] && !bitmap[1])
- return (0);
+ if (!bitmap[0] && !bitmap[1]) {
+ return 0;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, getbitmap);
if (NFS_BITMAP_ISSET(bitmap, NFS_FATTR_ACL) ||
NFS_BITMAP_ISSET(bitmap, NFS_FATTR_MODE)) {
- if (NACLVALID(np))
+ if (NACLVALID(np)) {
NFS_BITMAP_SET(getbitmap, NFS_FATTR_ACL);
+ }
NACLINVALIDATE(np);
}
nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
numops--;
nfsm_chain_add_32(error, &nmreq, NFS_OP_SETATTR);
- if (VATTR_IS_ACTIVE(vap, va_data_size))
+ if (VATTR_IS_ACTIVE(vap, va_data_size)) {
nfs_get_stateid(np, vfs_context_thread(ctx), vfs_context_ucred(ctx), &stateid);
- else
+ } else {
stateid.seqid = stateid.other[0] = stateid.other[1] = stateid.other[2] = 0;
+ }
nfsm_chain_add_stateid(error, &nmreq, &stateid);
nfsm_chain_add_fattr4(error, &nmreq, vap, nmp);
numops--;
nfsmout_if(error);
error = nfs_request(np, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
bmlen = NFS_ATTR_BITMAP_LEN;
nfsm_chain_get_bitmap(error, &nmrep, setbitmap, bmlen);
if (!error) {
- if (VATTR_IS_ACTIVE(vap, va_data_size) && (np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR))
+ if (VATTR_IS_ACTIVE(vap, va_data_size) && (np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)) {
microuptime(&np->n_lastio);
+ }
nfs_vattr_set_supported(setbitmap, vap);
error = setattr_error;
}
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
- if (error)
+ if (error) {
NATTRINVALIDATE(np);
+ }
/*
* We just changed the attributes and we want to make sure that we
* see the latest attributes. Get the next XID. If it's not the
NATTRINVALIDATE(np);
}
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
if ((setattr_error == EINVAL) && VATTR_IS_ACTIVE(vap, va_acl) && VATTR_IS_ACTIVE(vap, va_mode) && !NMFLAG(nmp, ACLONLY)) {
* but mode was already successfully set).
*/
if (((bitmap[0] & setbitmap[0]) != bitmap[0]) ||
- ((bitmap[1] & (setbitmap[1]|NFS_FATTR_MODE)) != bitmap[1])) {
+ ((bitmap[1] & (setbitmap[1] | NFS_FATTR_MODE)) != bitmap[1])) {
VATTR_CLEAR_ACTIVE(vap, va_mode);
error = 0;
goto tryagain;
}
}
- return (error);
+ return error;
}
+#endif /* CONFIG_NFS4 */
/*
* Wait for any pending recovery to complete.
int
nfs_mount_state_wait_for_recovery(struct nfsmount *nmp)
{
- struct timespec ts = { 1, 0 };
+ struct timespec ts = { .tv_sec = 1, .tv_nsec = 0 };
int error = 0, slpflag = NMFLAG(nmp, INTR) ? PCATCH : 0;
lck_mtx_lock(&nmp->nm_lock);
while (nmp->nm_state & NFSSTA_RECOVER) {
- if ((error = nfs_sigintr(nmp, NULL, current_thread(), 1)))
+ if ((error = nfs_sigintr(nmp, NULL, current_thread(), 1))) {
break;
+ }
nfs_mount_sock_thread_wake(nmp);
- msleep(&nmp->nm_state, &nmp->nm_lock, slpflag|(PZERO-1), "nfsrecoverwait", &ts);
+ msleep(&nmp->nm_state, &nmp->nm_lock, slpflag | (PZERO - 1), "nfsrecoverwait", &ts);
slpflag = 0;
}
lck_mtx_unlock(&nmp->nm_lock);
- return (error);
+ return error;
}
/*
int
nfs_mount_state_in_use_start(struct nfsmount *nmp, thread_t thd)
{
- struct timespec ts = { 1, 0 };
+ struct timespec ts = { .tv_sec = 1, .tv_nsec = 0 };
int error = 0, slpflag = (NMFLAG(nmp, INTR) && thd) ? PCATCH : 0;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
lck_mtx_lock(&nmp->nm_lock);
- if (nmp->nm_state & (NFSSTA_FORCE|NFSSTA_DEAD)) {
+ if (nmp->nm_state & (NFSSTA_FORCE | NFSSTA_DEAD)) {
lck_mtx_unlock(&nmp->nm_lock);
- return (ENXIO);
+ return ENXIO;
}
while (nmp->nm_state & NFSSTA_RECOVER) {
- if ((error = nfs_sigintr(nmp, NULL, thd, 1)))
+ if ((error = nfs_sigintr(nmp, NULL, thd, 1))) {
break;
+ }
nfs_mount_sock_thread_wake(nmp);
- msleep(&nmp->nm_state, &nmp->nm_lock, slpflag|(PZERO-1), "nfsrecoverwait", &ts);
+ msleep(&nmp->nm_state, &nmp->nm_lock, slpflag | (PZERO - 1), "nfsrecoverwait", &ts);
slpflag = 0;
}
- if (!error)
+ if (!error) {
nmp->nm_stateinuse++;
+ }
lck_mtx_unlock(&nmp->nm_lock);
- return (error);
+ return error;
}
/*
{
int restart = nfs_mount_state_error_should_restart(error);
- if (nfs_mount_gone(nmp))
- return (restart);
+ if (nfs_mount_gone(nmp)) {
+ return restart;
+ }
lck_mtx_lock(&nmp->nm_lock);
if (restart && (error != NFSERR_OLD_STATEID) && (error != NFSERR_GRACE)) {
printf("nfs_mount_state_in_use_end: error %d, initiating recovery for %s, 0x%x\n",
- error, vfs_statfs(nmp->nm_mountp)->f_mntfromname, nmp->nm_stategenid);
+ error, vfs_statfs(nmp->nm_mountp)->f_mntfromname, nmp->nm_stategenid);
nfs_need_recover(nmp, error);
}
- if (nmp->nm_stateinuse > 0)
+ if (nmp->nm_stateinuse > 0) {
nmp->nm_stateinuse--;
- else
+ } else {
panic("NFS mount state in use count underrun");
- if (!nmp->nm_stateinuse && (nmp->nm_state & NFSSTA_RECOVER))
+ }
+ if (!nmp->nm_stateinuse && (nmp->nm_state & NFSSTA_RECOVER)) {
wakeup(&nmp->nm_stateinuse);
+ }
lck_mtx_unlock(&nmp->nm_lock);
- if (error == NFSERR_GRACE)
- tsleep(&nmp->nm_state, (PZERO-1), "nfsgrace", 2*hz);
+ if (error == NFSERR_GRACE) {
+ tsleep(&nmp->nm_state, (PZERO - 1), "nfsgrace", 2 * hz);
+ }
- return (restart);
+ return restart;
}
/*
case NFSERR_OLD_STATEID:
case NFSERR_BAD_STATEID:
case NFSERR_GRACE:
- return (1);
+ return 1;
}
- return (0);
+ return 0;
}
/*
uint
nfs_mount_state_max_restarts(struct nfsmount *nmp)
{
- return (MAX(nmp->nm_fsattr.nfsa_lease, 60));
+ return MAX(nmp->nm_fsattr.nfsa_lease, 60);
}
/*
case NFSERR_OLD_STATEID:
case NFSERR_BAD_STATEID:
case NFSERR_GRACE: /* ugh! (stupid) RFC 3530 specifically disallows CLAIM_DELEGATE_CUR during grace period? */
- return (1);
+ return 1;
}
- return (0);
+ return 0;
}
nfs_open_state_set_busy(nfsnode_t np, thread_t thd)
{
struct nfsmount *nmp;
- struct timespec ts = {2, 0};
+ struct timespec ts = { .tv_sec = 2, .tv_nsec = 0 };
int error = 0, slpflag;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
slpflag = (NMFLAG(nmp, INTR) && thd) ? PCATCH : 0;
lck_mtx_lock(&np->n_openlock);
while (np->n_openflags & N_OPENBUSY) {
- if ((error = nfs_sigintr(nmp, NULL, thd, 0)))
+ if ((error = nfs_sigintr(nmp, NULL, thd, 0))) {
break;
+ }
np->n_openflags |= N_OPENWANT;
msleep(&np->n_openflags, &np->n_openlock, slpflag, "nfs_open_state_set_busy", &ts);
slpflag = 0;
}
- if (!error)
+ if (!error) {
np->n_openflags |= N_OPENBUSY;
+ }
lck_mtx_unlock(&np->n_openlock);
- return (error);
+ return error;
}
/*
int wanted;
lck_mtx_lock(&np->n_openlock);
- if (!(np->n_openflags & N_OPENBUSY))
+ if (!(np->n_openflags & N_OPENBUSY)) {
panic("nfs_open_state_clear_busy");
+ }
wanted = (np->n_openflags & N_OPENWANT);
- np->n_openflags &= ~(N_OPENBUSY|N_OPENWANT);
+ np->n_openflags &= ~(N_OPENBUSY | N_OPENWANT);
lck_mtx_unlock(&np->n_openlock);
- if (wanted)
+ if (wanted) {
wakeup(&np->n_openflags);
+ }
}
/*
tryagain:
lck_mtx_lock(&nmp->nm_lock);
TAILQ_FOREACH(noop, &nmp->nm_open_owners, noo_link) {
- if (kauth_cred_getuid(noop->noo_cred) == uid)
+ if (kauth_cred_getuid(noop->noo_cred) == uid) {
break;
+ }
}
if (!noop && !newnoop && alloc) {
lck_mtx_unlock(&nmp->nm_lock);
MALLOC(newnoop, struct nfs_open_owner *, sizeof(struct nfs_open_owner), M_TEMP, M_WAITOK);
- if (!newnoop)
- return (NULL);
+ if (!newnoop) {
+ return NULL;
+ }
bzero(newnoop, sizeof(*newnoop));
lck_mtx_init(&newnoop->noo_lock, nfs_open_grp, LCK_ATTR_NULL);
newnoop->noo_mount = nmp;
}
if (!noop && newnoop) {
newnoop->noo_flags |= NFS_OPEN_OWNER_LINK;
+ os_ref_init(&newnoop->noo_refcnt, NULL);
TAILQ_INSERT_HEAD(&nmp->nm_open_owners, newnoop, noo_link);
noop = newnoop;
}
lck_mtx_unlock(&nmp->nm_lock);
- if (newnoop && (noop != newnoop))
+ if (newnoop && (noop != newnoop)) {
nfs_open_owner_destroy(newnoop);
+ }
- if (noop)
+ if (noop) {
nfs_open_owner_ref(noop);
+ }
- return (noop);
+ return noop;
}
/*
void
nfs_open_owner_destroy(struct nfs_open_owner *noop)
{
- if (noop->noo_cred)
+ if (noop->noo_cred) {
kauth_cred_unref(&noop->noo_cred);
+ }
lck_mtx_destroy(&noop->noo_lock, nfs_open_grp);
FREE(noop, M_TEMP);
}
nfs_open_owner_ref(struct nfs_open_owner *noop)
{
lck_mtx_lock(&noop->noo_lock);
- noop->noo_refcnt++;
+ os_ref_retain_locked(&noop->noo_refcnt);
lck_mtx_unlock(&noop->noo_lock);
}
void
nfs_open_owner_rele(struct nfs_open_owner *noop)
{
+ os_ref_count_t newcount;
+
lck_mtx_lock(&noop->noo_lock);
- if (noop->noo_refcnt < 1)
+ if (os_ref_get_count(&noop->noo_refcnt) < 1) {
panic("nfs_open_owner_rele: no refcnt");
- noop->noo_refcnt--;
- if (!noop->noo_refcnt && (noop->noo_flags & NFS_OPEN_OWNER_BUSY))
+ }
+ newcount = os_ref_release_locked(&noop->noo_refcnt);
+ if (!newcount && (noop->noo_flags & NFS_OPEN_OWNER_BUSY)) {
panic("nfs_open_owner_rele: busy");
+ }
/* XXX we may potentially want to clean up idle/unused open owner structures */
- if (noop->noo_refcnt || (noop->noo_flags & NFS_OPEN_OWNER_LINK)) {
+ if (newcount || (noop->noo_flags & NFS_OPEN_OWNER_LINK)) {
lck_mtx_unlock(&noop->noo_lock);
return;
}
nfs_open_owner_set_busy(struct nfs_open_owner *noop, thread_t thd)
{
struct nfsmount *nmp;
- struct timespec ts = {2, 0};
+ struct timespec ts = { .tv_sec = 2, .tv_nsec = 0 };
int error = 0, slpflag;
nmp = noop->noo_mount;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
slpflag = (NMFLAG(nmp, INTR) && thd) ? PCATCH : 0;
lck_mtx_lock(&noop->noo_lock);
while (noop->noo_flags & NFS_OPEN_OWNER_BUSY) {
- if ((error = nfs_sigintr(nmp, NULL, thd, 0)))
+ if ((error = nfs_sigintr(nmp, NULL, thd, 0))) {
break;
+ }
noop->noo_flags |= NFS_OPEN_OWNER_WANT;
msleep(noop, &noop->noo_lock, slpflag, "nfs_open_owner_set_busy", &ts);
slpflag = 0;
}
- if (!error)
+ if (!error) {
noop->noo_flags |= NFS_OPEN_OWNER_BUSY;
+ }
lck_mtx_unlock(&noop->noo_lock);
- return (error);
+ return error;
}
/*
int wanted;
lck_mtx_lock(&noop->noo_lock);
- if (!(noop->noo_flags & NFS_OPEN_OWNER_BUSY))
+ if (!(noop->noo_flags & NFS_OPEN_OWNER_BUSY)) {
panic("nfs_open_owner_clear_busy");
+ }
wanted = (noop->noo_flags & NFS_OPEN_OWNER_WANT);
- noop->noo_flags &= ~(NFS_OPEN_OWNER_BUSY|NFS_OPEN_OWNER_WANT);
+ noop->noo_flags &= ~(NFS_OPEN_OWNER_BUSY | NFS_OPEN_OWNER_WANT);
lck_mtx_unlock(&noop->noo_lock);
- if (wanted)
+ if (wanted) {
wakeup(noop);
+ }
}
/*
/* do not increment the open seqid on these errors */
return;
}
- if (noop)
+ if (noop) {
noop->noo_seqid++;
- if (nlop)
+ }
+ if (nlop) {
nlop->nlo_seqid++;
+ }
}
/*
{
struct nfs_open_file *nofp = NULL, *nofp2, *newnofp = NULL;
- if (!np)
+ if (!np) {
goto alloc;
+ }
tryagain:
lck_mtx_lock(&np->n_openlock);
TAILQ_FOREACH(nofp2, &np->n_opens, nof_link) {
if (nofp2->nof_owner == noop) {
nofp = nofp2;
- if (!accessMode)
+ if (!accessMode) {
break;
+ }
}
if ((accessMode & nofp2->nof_deny) || (denyMode & nofp2->nof_access)) {
/* This request conflicts with an existing open on this client. */
lck_mtx_unlock(&np->n_openlock);
- return (EACCES);
+ return EACCES;
}
}
lck_mtx_unlock(&np->n_openlock);
alloc:
MALLOC(newnofp, struct nfs_open_file *, sizeof(struct nfs_open_file), M_TEMP, M_WAITOK);
- if (!newnofp)
- return (ENOMEM);
+ if (!newnofp) {
+ return ENOMEM;
+ }
bzero(newnofp, sizeof(*newnofp));
lck_mtx_init(&newnofp->nof_lock, nfs_open_grp, LCK_ATTR_NULL);
newnofp->nof_owner = noop;
lck_mtx_lock(&noop->noo_lock);
TAILQ_INSERT_HEAD(&noop->noo_opens, newnofp, nof_oolink);
lck_mtx_unlock(&noop->noo_lock);
- if (np)
+ if (np) {
goto tryagain;
+ }
}
if (!nofp) {
if (*nofpp) {
} else {
nofp = newnofp;
}
- if (nofp && np)
+ if (nofp && np) {
TAILQ_INSERT_HEAD(&np->n_opens, nofp, nof_link);
+ }
}
- if (np)
+ if (np) {
lck_mtx_unlock(&np->n_openlock);
+ }
- if (alloc && newnofp && (nofp != newnofp))
+ if (alloc && newnofp && (nofp != newnofp)) {
nfs_open_file_destroy(newnofp);
+ }
*nofpp = nofp;
- return (nofp ? 0 : ESRCH);
+ return nofp ? 0 : ESRCH;
}
/*
nfs_open_file_set_busy(struct nfs_open_file *nofp, thread_t thd)
{
struct nfsmount *nmp;
- struct timespec ts = {2, 0};
+ struct timespec ts = { .tv_sec = 2, .tv_nsec = 0 };
int error = 0, slpflag;
nmp = nofp->nof_owner->noo_mount;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
slpflag = (NMFLAG(nmp, INTR) && thd) ? PCATCH : 0;
lck_mtx_lock(&nofp->nof_lock);
while (nofp->nof_flags & NFS_OPEN_FILE_BUSY) {
- if ((error = nfs_sigintr(nmp, NULL, thd, 0)))
+ if ((error = nfs_sigintr(nmp, NULL, thd, 0))) {
break;
+ }
nofp->nof_flags |= NFS_OPEN_FILE_WANT;
msleep(nofp, &nofp->nof_lock, slpflag, "nfs_open_file_set_busy", &ts);
slpflag = 0;
}
- if (!error)
+ if (!error) {
nofp->nof_flags |= NFS_OPEN_FILE_BUSY;
+ }
lck_mtx_unlock(&nofp->nof_lock);
- return (error);
+ return error;
}
/*
int wanted;
lck_mtx_lock(&nofp->nof_lock);
- if (!(nofp->nof_flags & NFS_OPEN_FILE_BUSY))
+ if (!(nofp->nof_flags & NFS_OPEN_FILE_BUSY)) {
panic("nfs_open_file_clear_busy");
+ }
wanted = (nofp->nof_flags & NFS_OPEN_FILE_WANT);
- nofp->nof_flags &= ~(NFS_OPEN_FILE_BUSY|NFS_OPEN_FILE_WANT);
+ nofp->nof_flags &= ~(NFS_OPEN_FILE_BUSY | NFS_OPEN_FILE_WANT);
lck_mtx_unlock(&nofp->nof_lock);
- if (wanted)
+ if (wanted) {
wakeup(nofp);
+ }
}
/*
if (delegated) {
if (denyMode == NFS_OPEN_SHARE_DENY_NONE) {
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
nofp->nof_d_r++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
nofp->nof_d_w++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
nofp->nof_d_rw++;
+ }
} else if (denyMode == NFS_OPEN_SHARE_DENY_WRITE) {
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
nofp->nof_d_r_dw++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
nofp->nof_d_w_dw++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
nofp->nof_d_rw_dw++;
+ }
} else { /* NFS_OPEN_SHARE_DENY_BOTH */
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
nofp->nof_d_r_drw++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
nofp->nof_d_w_drw++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
nofp->nof_d_rw_drw++;
+ }
}
} else {
if (denyMode == NFS_OPEN_SHARE_DENY_NONE) {
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
nofp->nof_r++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
nofp->nof_w++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
nofp->nof_rw++;
+ }
} else if (denyMode == NFS_OPEN_SHARE_DENY_WRITE) {
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
nofp->nof_r_dw++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
nofp->nof_w_dw++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
nofp->nof_rw_dw++;
+ }
} else { /* NFS_OPEN_SHARE_DENY_BOTH */
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
nofp->nof_r_drw++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
nofp->nof_w_drw++;
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
nofp->nof_rw_drw++;
+ }
}
}
if ((accessMode & NFS_OPEN_SHARE_ACCESS_READ) &&
(nofp->nof_access & NFS_OPEN_SHARE_ACCESS_READ) &&
((nofp->nof_r + nofp->nof_d_r +
- nofp->nof_rw + nofp->nof_d_rw +
- nofp->nof_r_dw + nofp->nof_d_r_dw +
- nofp->nof_rw_dw + nofp->nof_d_rw_dw +
- nofp->nof_r_drw + nofp->nof_d_r_drw +
- nofp->nof_rw_dw + nofp->nof_d_rw_dw) == 1))
+ nofp->nof_rw + nofp->nof_d_rw +
+ nofp->nof_r_dw + nofp->nof_d_r_dw +
+ nofp->nof_rw_dw + nofp->nof_d_rw_dw +
+ nofp->nof_r_drw + nofp->nof_d_r_drw +
+ nofp->nof_rw_dw + nofp->nof_d_rw_dw) == 1)) {
*newAccessMode &= ~NFS_OPEN_SHARE_ACCESS_READ;
+ }
if ((accessMode & NFS_OPEN_SHARE_ACCESS_WRITE) &&
(nofp->nof_access & NFS_OPEN_SHARE_ACCESS_WRITE) &&
((nofp->nof_w + nofp->nof_d_w +
- nofp->nof_rw + nofp->nof_d_rw +
- nofp->nof_w_dw + nofp->nof_d_w_dw +
- nofp->nof_rw_dw + nofp->nof_d_rw_dw +
- nofp->nof_w_drw + nofp->nof_d_w_drw +
- nofp->nof_rw_dw + nofp->nof_d_rw_dw) == 1))
+ nofp->nof_rw + nofp->nof_d_rw +
+ nofp->nof_w_dw + nofp->nof_d_w_dw +
+ nofp->nof_rw_dw + nofp->nof_d_rw_dw +
+ nofp->nof_w_drw + nofp->nof_d_w_drw +
+ nofp->nof_rw_dw + nofp->nof_d_rw_dw) == 1)) {
*newAccessMode &= ~NFS_OPEN_SHARE_ACCESS_WRITE;
+ }
if ((denyMode & NFS_OPEN_SHARE_DENY_READ) &&
(nofp->nof_deny & NFS_OPEN_SHARE_DENY_READ) &&
((nofp->nof_r_drw + nofp->nof_d_r_drw +
- nofp->nof_w_drw + nofp->nof_d_w_drw +
- nofp->nof_rw_drw + nofp->nof_d_rw_drw) == 1))
+ nofp->nof_w_drw + nofp->nof_d_w_drw +
+ nofp->nof_rw_drw + nofp->nof_d_rw_drw) == 1)) {
*newDenyMode &= ~NFS_OPEN_SHARE_DENY_READ;
+ }
if ((denyMode & NFS_OPEN_SHARE_DENY_WRITE) &&
(nofp->nof_deny & NFS_OPEN_SHARE_DENY_WRITE) &&
((nofp->nof_r_drw + nofp->nof_d_r_drw +
- nofp->nof_w_drw + nofp->nof_d_w_drw +
- nofp->nof_rw_drw + nofp->nof_d_rw_drw +
- nofp->nof_r_dw + nofp->nof_d_r_dw +
- nofp->nof_w_dw + nofp->nof_d_w_dw +
- nofp->nof_rw_dw + nofp->nof_d_rw_dw) == 1))
+ nofp->nof_w_drw + nofp->nof_d_w_drw +
+ nofp->nof_rw_drw + nofp->nof_d_rw_drw +
+ nofp->nof_r_dw + nofp->nof_d_r_dw +
+ nofp->nof_w_dw + nofp->nof_d_w_dw +
+ nofp->nof_rw_dw + nofp->nof_d_rw_dw) == 1)) {
*newDenyMode &= ~NFS_OPEN_SHARE_DENY_WRITE;
+ }
/* Find the corresponding open access/deny mode counter. */
if (denyMode == NFS_OPEN_SHARE_DENY_NONE) {
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
*delegated = (nofp->nof_d_r != 0);
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
*delegated = (nofp->nof_d_w != 0);
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
*delegated = (nofp->nof_d_rw != 0);
- else
+ } else {
*delegated = 0;
+ }
} else if (denyMode == NFS_OPEN_SHARE_DENY_WRITE) {
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
*delegated = (nofp->nof_d_r_dw != 0);
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
*delegated = (nofp->nof_d_w_dw != 0);
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
*delegated = (nofp->nof_d_rw_dw != 0);
- else
+ } else {
*delegated = 0;
+ }
} else { /* NFS_OPEN_SHARE_DENY_BOTH */
- if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
*delegated = (nofp->nof_d_r_drw != 0);
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
*delegated = (nofp->nof_d_w_drw != 0);
- else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+ } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
*delegated = (nofp->nof_d_rw_drw != 0);
- else
+ } else {
*delegated = 0;
+ }
}
}
if (denyMode == NFS_OPEN_SHARE_DENY_NONE) {
if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
if (delegated) {
- if (nofp->nof_d_r == 0)
+ if (nofp->nof_d_r == 0) {
NP(nofp->nof_np, "nfs: open(R) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_r--;
+ }
} else {
- if (nofp->nof_r == 0)
+ if (nofp->nof_r == 0) {
NP(nofp->nof_np, "nfs: open(R) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_r--;
+ }
}
} else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
if (delegated) {
- if (nofp->nof_d_w == 0)
+ if (nofp->nof_d_w == 0) {
NP(nofp->nof_np, "nfs: open(W) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_w--;
+ }
} else {
- if (nofp->nof_w == 0)
+ if (nofp->nof_w == 0) {
NP(nofp->nof_np, "nfs: open(W) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_w--;
+ }
}
} else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
if (delegated) {
- if (nofp->nof_d_rw == 0)
+ if (nofp->nof_d_rw == 0) {
NP(nofp->nof_np, "nfs: open(RW) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_rw--;
+ }
} else {
- if (nofp->nof_rw == 0)
+ if (nofp->nof_rw == 0) {
NP(nofp->nof_np, "nfs: open(RW) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_rw--;
+ }
}
}
} else if (denyMode == NFS_OPEN_SHARE_DENY_WRITE) {
if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
if (delegated) {
- if (nofp->nof_d_r_dw == 0)
+ if (nofp->nof_d_r_dw == 0) {
NP(nofp->nof_np, "nfs: open(R,DW) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_r_dw--;
+ }
} else {
- if (nofp->nof_r_dw == 0)
+ if (nofp->nof_r_dw == 0) {
NP(nofp->nof_np, "nfs: open(R,DW) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_r_dw--;
+ }
}
} else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
if (delegated) {
- if (nofp->nof_d_w_dw == 0)
+ if (nofp->nof_d_w_dw == 0) {
NP(nofp->nof_np, "nfs: open(W,DW) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_w_dw--;
+ }
} else {
- if (nofp->nof_w_dw == 0)
+ if (nofp->nof_w_dw == 0) {
NP(nofp->nof_np, "nfs: open(W,DW) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_w_dw--;
+ }
}
} else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
if (delegated) {
- if (nofp->nof_d_rw_dw == 0)
+ if (nofp->nof_d_rw_dw == 0) {
NP(nofp->nof_np, "nfs: open(RW,DW) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_rw_dw--;
+ }
} else {
- if (nofp->nof_rw_dw == 0)
+ if (nofp->nof_rw_dw == 0) {
NP(nofp->nof_np, "nfs: open(RW,DW) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_rw_dw--;
+ }
}
}
} else { /* NFS_OPEN_SHARE_DENY_BOTH */
if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
if (delegated) {
- if (nofp->nof_d_r_drw == 0)
+ if (nofp->nof_d_r_drw == 0) {
NP(nofp->nof_np, "nfs: open(R,DRW) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_r_drw--;
+ }
} else {
- if (nofp->nof_r_drw == 0)
+ if (nofp->nof_r_drw == 0) {
NP(nofp->nof_np, "nfs: open(R,DRW) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_r_drw--;
+ }
}
} else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
if (delegated) {
- if (nofp->nof_d_w_drw == 0)
+ if (nofp->nof_d_w_drw == 0) {
NP(nofp->nof_np, "nfs: open(W,DRW) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_w_drw--;
+ }
} else {
- if (nofp->nof_w_drw == 0)
+ if (nofp->nof_w_drw == 0) {
NP(nofp->nof_np, "nfs: open(W,DRW) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_w_drw--;
+ }
}
} else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
if (delegated) {
- if (nofp->nof_d_rw_drw == 0)
+ if (nofp->nof_d_rw_drw == 0) {
NP(nofp->nof_np, "nfs: open(RW,DRW) delegated count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_d_rw_drw--;
+ }
} else {
- if (nofp->nof_rw_drw == 0)
+ if (nofp->nof_rw_drw == 0) {
NP(nofp->nof_np, "nfs: open(RW,DRW) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
- else
+ } else {
nofp->nof_rw_drw--;
+ }
}
}
}
lck_mtx_unlock(&nofp->nof_lock);
}
-
+#if CONFIG_NFS4
/*
* Get the current (delegation, lock, open, default) stateid for this node.
* If node has a delegation, use that stateid.
if (np->n_openflags & N_DELEG_MASK) {
s = &np->n_dstateid;
} else {
- if (p)
+ if (p) {
nlop = nfs_lock_owner_find(np, p, 0);
+ }
if (nlop && !TAILQ_EMPTY(&nlop->nlo_locks)) {
/* we hold locks, use lock stateid */
s = &nlop->nlo_stateid;
} else if (((noop = nfs_open_owner_find(nmp, cred, 0))) &&
- (nfs_open_file_find(np, noop, &nofp, 0, 0, 0) == 0) &&
- !(nofp->nof_flags & NFS_OPEN_FILE_LOST) &&
- nofp->nof_access) {
+ (nfs_open_file_find(np, noop, &nofp, 0, 0, 0) == 0) &&
+ !(nofp->nof_flags & NFS_OPEN_FILE_LOST) &&
+ nofp->nof_access) {
/* we (should) have the file open, use open stateid */
- if (nofp->nof_flags & NFS_OPEN_FILE_REOPEN)
+ if (nofp->nof_flags & NFS_OPEN_FILE_REOPEN) {
nfs4_reopen(nofp, thd);
- if (!(nofp->nof_flags & NFS_OPEN_FILE_LOST))
+ }
+ if (!(nofp->nof_flags & NFS_OPEN_FILE_LOST)) {
s = &nofp->nof_stateid;
+ }
}
}
sid->other[2] = s->other[2];
} else {
/* named attributes may not have a stateid for reads, so don't complain for them */
- if (!(np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR))
+ if (!(np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)) {
NP(np, "nfs_get_stateid: no stateid");
+ }
sid->seqid = sid->other[0] = sid->other[1] = sid->other[2] = 0xffffffff;
}
- if (nlop)
+ if (nlop) {
nfs_lock_owner_rele(nlop);
- if (noop)
+ }
+ if (noop) {
nfs_open_owner_rele(noop);
+ }
}
tryagain:
action = 0;
- if (accessMode & NFS_OPEN_SHARE_ACCESS_READ)
+ if (accessMode & NFS_OPEN_SHARE_ACCESS_READ) {
action |= KAUTH_VNODE_READ_DATA;
- if (accessMode & NFS_OPEN_SHARE_ACCESS_WRITE)
+ }
+ if (accessMode & NFS_OPEN_SHARE_ACCESS_WRITE) {
action |= KAUTH_VNODE_WRITE_DATA;
+ }
/* evaluate ACE (if we have one) */
if (np->n_dace.ace_flags) {
eval.ae_acl = &np->n_dace;
eval.ae_count = 1;
eval.ae_options = 0;
- if (np->n_vattr.nva_uid == kauth_cred_getuid(cred))
+ if (np->n_vattr.nva_uid == kauth_cred_getuid(cred)) {
eval.ae_options |= KAUTH_AEVAL_IS_OWNER;
+ }
error = kauth_cred_ismember_gid(cred, np->n_vattr.nva_gid, &ismember);
- if (!error && ismember)
+ if (!error && ismember) {
eval.ae_options |= KAUTH_AEVAL_IN_GROUP;
+ }
eval.ae_exp_gall = KAUTH_VNODE_GENERIC_ALL_BITS;
eval.ae_exp_gread = KAUTH_VNODE_GENERIC_READ_BITS;
error = kauth_acl_evaluate(cred, &eval);
- if (!error && (eval.ae_result == KAUTH_RESULT_ALLOW))
+ if (!error && (eval.ae_result == KAUTH_RESULT_ALLOW)) {
authorized = 1;
+ }
}
if (!authorized) {
naa.a_vp = NFSTOV(np);
naa.a_action = action;
naa.a_context = ctx;
- if (!(error = nfs_vnop_access(&naa)))
+ if (!(error = nfs_vnop_access(&naa))) {
authorized = 1;
+ }
}
if (!authorized) {
readtoo = 0;
goto tryagain;
}
- return (error ? error : EACCES);
+ return error ? error : EACCES;
}
nfs_open_file_add_open(nofp, accessMode, denyMode, 1);
- return (0);
+ return 0;
}
* use the delegation if it's being returned.
*/
if (np->n_openflags & N_DELEG_MASK) {
- if ((error = nfs_open_state_set_busy(np, vfs_context_thread(ctx))))
- return (error);
+ if ((error = nfs_open_state_set_busy(np, vfs_context_thread(ctx)))) {
+ return error;
+ }
if ((np->n_openflags & N_DELEG_MASK) && !(np->n_openflags & N_DELEG_RETURN) &&
(((np->n_openflags & N_DELEG_MASK) == N_DELEG_WRITE) ||
- (!(accessMode & NFS_OPEN_SHARE_ACCESS_WRITE) && !(denyMode & NFS_OPEN_SHARE_DENY_READ)))) {
+ (!(accessMode & NFS_OPEN_SHARE_ACCESS_WRITE) && !(denyMode & NFS_OPEN_SHARE_DENY_READ)))) {
error = nfs4_open_delegated(np, nofp, accessMode, denyMode, ctx);
nfs_open_state_clear_busy(np);
- return (error);
+ return error;
}
nfs_open_state_clear_busy(np);
}
* from the n_parent we have stashed away.
*/
if ((np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) &&
- (((dvp = np->n_parent)) && (error = vnode_get(dvp))))
+ (((dvp = np->n_parent)) && (error = vnode_get(dvp)))) {
dvp = NULL;
- if (!dvp)
+ }
+ if (!dvp) {
dvp = vnode_getparent(vp);
+ }
vname = vnode_getname(vp);
if (!dvp || !vname) {
- if (!error)
+ if (!error) {
error = EIO;
+ }
goto out;
}
filename = &smallname[0];
namelen = snprintf(filename, sizeof(smallname), "%s", vname);
if (namelen >= sizeof(smallname)) {
- MALLOC(filename, char *, namelen+1, M_TEMP, M_WAITOK);
+ MALLOC(filename, char *, namelen + 1, M_TEMP, M_WAITOK);
if (!filename) {
error = ENOMEM;
goto out;
}
- snprintf(filename, namelen+1, "%s", vname);
+ snprintf(filename, namelen + 1, "%s", vname);
}
bzero(&cn, sizeof(cn));
cn.cn_nameptr = filename;
}
nfs_open_file_add_open(nofp, accessMode, denyMode, 0);
out:
- if (filename && (filename != &smallname[0]))
+ if (filename && (filename != &smallname[0])) {
FREE(filename, M_TEMP);
- if (vname)
+ }
+ if (vname) {
vnode_putname(vname);
- if (dvp != NULLVP)
+ }
+ if (dvp != NULLVP) {
vnode_put(dvp);
- return (error);
+ }
+ return error;
}
+#endif /* CONFIG_NFS4 */
int
nfs_vnop_mmap(
struct vnop_mmap_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- int a_fflags;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * int a_fflags;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
vnode_t vp = ap->a_vp;
struct nfs_open_file *nofp = NULL;
nmp = VTONMP(vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
- if (!vnode_isreg(vp) || !(ap->a_fflags & (PROT_READ|PROT_WRITE)))
- return (EINVAL);
- if (np->n_flag & NREVOKE)
- return (EIO);
+ if (!vnode_isreg(vp) || !(ap->a_fflags & (PROT_READ | PROT_WRITE))) {
+ return EINVAL;
+ }
+ if (np->n_flag & NREVOKE) {
+ return EIO;
+ }
/*
* fflags contains some combination of: PROT_READ, PROT_WRITE
* read access is always there (regardless if PROT_READ is not set).
*/
accessMode = NFS_OPEN_SHARE_ACCESS_READ;
- if (ap->a_fflags & PROT_WRITE)
+ if (ap->a_fflags & PROT_WRITE) {
accessMode |= NFS_OPEN_SHARE_ACCESS_WRITE;
+ }
denyMode = NFS_OPEN_SHARE_DENY_NONE;
noop = nfs_open_owner_find(nmp, vfs_context_ucred(ctx), 1);
- if (!noop)
- return (ENOMEM);
+ if (!noop) {
+ return ENOMEM;
+ }
restart:
error = nfs_mount_state_in_use_start(nmp, NULL);
if (error) {
nfs_open_owner_rele(noop);
- return (error);
+ return error;
}
if (np->n_flag & NREVOKE) {
error = EIO;
nfs_mount_state_in_use_end(nmp, 0);
nfs_open_owner_rele(noop);
- return (error);
+ return error;
}
error = nfs_open_file_find(np, noop, &nofp, 0, 0, 1);
NP(np, "nfs_vnop_mmap: no open file for owner, error %d, %d", error, kauth_cred_getuid(noop->noo_cred));
error = EPERM;
}
+#if CONFIG_NFS4
if (!error && (nofp->nof_flags & NFS_OPEN_FILE_REOPEN)) {
nfs_mount_state_in_use_end(nmp, 0);
error = nfs4_reopen(nofp, NULL);
nofp = NULL;
- if (!error)
+ if (!error) {
goto restart;
+ }
}
- if (!error)
+#endif
+ if (!error) {
error = nfs_open_file_set_busy(nofp, NULL);
+ }
if (error) {
nofp = NULL;
goto out;
if (nofp->nof_flags & NFS_OPEN_FILE_NEEDCLOSE) {
/* We shouldn't get here. We've already open the file for execve */
NP(np, "nfs_vnop_mmap: File already needs close access: 0x%x, cred: %d thread: %lld",
- nofp->nof_access, kauth_cred_getuid(nofp->nof_owner->noo_cred), thread_tid(vfs_context_thread(ctx)));
+ nofp->nof_access, kauth_cred_getuid(nofp->nof_owner->noo_cred), thread_tid(vfs_context_thread(ctx)));
}
/*
* mmapings for execve are just for read. Get out with EPERM if the accessMode is not ACCESS_READ
/* NFS v2/v3 opens are always allowed - so just add it. */
nfs_open_file_add_open(nofp, NFS_OPEN_SHARE_ACCESS_READ, NFS_OPEN_SHARE_DENY_NONE, 0);
error = 0;
- } else {
+ }
+#if CONFIG_NFS4
+ else {
error = nfs4_open(np, nofp, NFS_OPEN_SHARE_ACCESS_READ, NFS_OPEN_SHARE_DENY_NONE, ctx);
}
- if (!error)
+#endif
+ if (!error) {
nofp->nof_flags |= NFS_OPEN_FILE_NEEDCLOSE;
- if (error)
+ }
+ if (error) {
goto out;
+ }
}
/* determine deny mode for open */
if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
if (nofp->nof_d_rw || nofp->nof_d_rw_dw || nofp->nof_d_rw_drw) {
delegated = 1;
- if (nofp->nof_d_rw)
+ if (nofp->nof_d_rw) {
denyMode = NFS_OPEN_SHARE_DENY_NONE;
- else if (nofp->nof_d_rw_dw)
+ } else if (nofp->nof_d_rw_dw) {
denyMode = NFS_OPEN_SHARE_DENY_WRITE;
- else if (nofp->nof_d_rw_drw)
+ } else if (nofp->nof_d_rw_drw) {
denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+ }
} else if (nofp->nof_rw || nofp->nof_rw_dw || nofp->nof_rw_drw) {
delegated = 0;
- if (nofp->nof_rw)
+ if (nofp->nof_rw) {
denyMode = NFS_OPEN_SHARE_DENY_NONE;
- else if (nofp->nof_rw_dw)
+ } else if (nofp->nof_rw_dw) {
denyMode = NFS_OPEN_SHARE_DENY_WRITE;
- else if (nofp->nof_rw_drw)
+ } else if (nofp->nof_rw_drw) {
denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+ }
} else {
error = EPERM;
}
} else { /* NFS_OPEN_SHARE_ACCESS_READ */
if (nofp->nof_d_r || nofp->nof_d_r_dw || nofp->nof_d_r_drw) {
delegated = 1;
- if (nofp->nof_d_r)
+ if (nofp->nof_d_r) {
denyMode = NFS_OPEN_SHARE_DENY_NONE;
- else if (nofp->nof_d_r_dw)
+ } else if (nofp->nof_d_r_dw) {
denyMode = NFS_OPEN_SHARE_DENY_WRITE;
- else if (nofp->nof_d_r_drw)
+ } else if (nofp->nof_d_r_drw) {
denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+ }
} else if (nofp->nof_r || nofp->nof_r_dw || nofp->nof_r_drw) {
delegated = 0;
- if (nofp->nof_r)
+ if (nofp->nof_r) {
denyMode = NFS_OPEN_SHARE_DENY_NONE;
- else if (nofp->nof_r_dw)
+ } else if (nofp->nof_r_dw) {
denyMode = NFS_OPEN_SHARE_DENY_WRITE;
- else if (nofp->nof_r_drw)
+ } else if (nofp->nof_r_drw) {
denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+ }
} else if (nofp->nof_d_rw || nofp->nof_d_rw_dw || nofp->nof_d_rw_drw) {
/*
* This clause and the one below is to co-opt a read write access
*/
delegated = 1;
accessMode = NFS_OPEN_SHARE_ACCESS_BOTH;
- if (nofp->nof_d_rw)
+ if (nofp->nof_d_rw) {
denyMode = NFS_OPEN_SHARE_DENY_NONE;
- else if (nofp->nof_d_rw_dw)
+ } else if (nofp->nof_d_rw_dw) {
denyMode = NFS_OPEN_SHARE_DENY_WRITE;
- else if (nofp->nof_d_rw_drw)
+ } else if (nofp->nof_d_rw_drw) {
denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+ }
} else if (nofp->nof_rw || nofp->nof_rw_dw || nofp->nof_rw_drw) {
delegated = 0;
accessMode = NFS_OPEN_SHARE_ACCESS_BOTH;
- if (nofp->nof_rw)
+ if (nofp->nof_rw) {
denyMode = NFS_OPEN_SHARE_DENY_NONE;
- else if (nofp->nof_rw_dw)
+ } else if (nofp->nof_rw_dw) {
denyMode = NFS_OPEN_SHARE_DENY_WRITE;
- else if (nofp->nof_rw_drw)
+ } else if (nofp->nof_rw_drw) {
denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+ }
} else {
error = EPERM;
}
}
- if (error) /* mmap mode without proper open mode */
+ if (error) { /* mmap mode without proper open mode */
goto out;
+ }
/*
* If the existing mmap access is more than the new access OR the
* then we'll stick with the existing mmap open mode.
*/
if ((nofp->nof_mmap_access > accessMode) ||
- ((nofp->nof_mmap_access == accessMode) && (nofp->nof_mmap_deny <= denyMode)))
+ ((nofp->nof_mmap_access == accessMode) && (nofp->nof_mmap_deny <= denyMode))) {
goto out;
+ }
/* update mmap open mode */
if (nofp->nof_mmap_access) {
error = nfs_close(np, nofp, nofp->nof_mmap_access, nofp->nof_mmap_deny, ctx);
if (error) {
- if (!nfs_mount_state_error_should_restart(error))
+ if (!nfs_mount_state_error_should_restart(error)) {
NP(np, "nfs_vnop_mmap: close of previous mmap mode failed: %d, %d", error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
+ }
NP(np, "nfs_vnop_mmap: update, close error %d, %d", error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
goto out;
}
nofp->nof_mmap_deny = denyMode;
out:
- if (nofp)
+ if (nofp) {
nfs_open_file_clear_busy(nofp);
+ }
if (nfs_mount_state_in_use_end(nmp, error)) {
nofp = NULL;
goto restart;
}
- if (noop)
+ if (noop) {
nfs_open_owner_rele(noop);
+ }
if (!error) {
int ismapped = 0;
lck_mtx_lock(&nmp->nm_lock);
nmp->nm_state &= ~NFSSTA_SQUISHY;
nmp->nm_curdeadtimeout = nmp->nm_deadtimeout;
- if (nmp->nm_curdeadtimeout <= 0)
+ if (nmp->nm_curdeadtimeout <= 0) {
nmp->nm_deadto_start = 0;
+ }
nmp->nm_mappers++;
lck_mtx_unlock(&nmp->nm_lock);
}
}
- return (error);
+ return error;
}
int
nfs_vnop_mnomap(
struct vnop_mnomap_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
vnode_t vp = ap->a_vp;
off_t size;
int error;
int is_mapped_flag = 0;
-
+
nmp = VTONMP(vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfs_node_lock_force(np);
if (np->n_flag & NISMAPPED) {
nfs_node_unlock(np);
if (is_mapped_flag) {
lck_mtx_lock(&nmp->nm_lock);
- if (nmp->nm_mappers)
+ if (nmp->nm_mappers) {
nmp->nm_mappers--;
- else
+ } else {
NP(np, "nfs_vnop_mnomap: removing mmap reference from mount, but mount has no files mmapped");
+ }
lck_mtx_unlock(&nmp->nm_lock);
}
/* flush buffers/ubc before we drop the open (in case it's our last open) */
nfs_flush(np, MNT_WAIT, vfs_context_thread(ctx), V_IGNORE_WRITEERR);
- if (UBCINFOEXISTS(vp) && (size = ubc_getsize(vp)))
+ if (UBCINFOEXISTS(vp) && (size = ubc_getsize(vp))) {
ubc_msync(vp, 0, size, NULL, UBC_PUSHALL | UBC_SYNC);
+ }
/* walk all open files and close all mmap opens */
loop:
error = nfs_mount_state_in_use_start(nmp, NULL);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
lck_mtx_lock(&np->n_openlock);
TAILQ_FOREACH(nofp, &np->n_opens, nof_link) {
- if (!nofp->nof_mmap_access)
+ if (!nofp->nof_mmap_access) {
continue;
+ }
lck_mtx_unlock(&np->n_openlock);
+#if CONFIG_NFS4
if (nofp->nof_flags & NFS_OPEN_FILE_REOPEN) {
nfs_mount_state_in_use_end(nmp, 0);
error = nfs4_reopen(nofp, NULL);
- if (!error)
+ if (!error) {
goto loop;
+ }
}
- if (!error)
+#endif
+ if (!error) {
error = nfs_open_file_set_busy(nofp, NULL);
+ }
if (error) {
lck_mtx_lock(&np->n_openlock);
break;
if (nofp->nof_mmap_access) {
error = nfs_close(np, nofp, nofp->nof_mmap_access, nofp->nof_mmap_deny, ctx);
if (!nfs_mount_state_error_should_restart(error)) {
- if (error) /* not a state-operation-restarting error, so just clear the access */
+ if (error) { /* not a state-operation-restarting error, so just clear the access */
NP(np, "nfs_vnop_mnomap: close of mmap mode failed: %d, %d", error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
+ }
nofp->nof_mmap_access = nofp->nof_mmap_deny = 0;
}
- if (error)
+ if (error) {
NP(np, "nfs_vnop_mnomap: error %d, %d", error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
+ }
}
nfs_open_file_clear_busy(nofp);
nfs_mount_state_in_use_end(nmp, error);
}
lck_mtx_unlock(&np->n_openlock);
nfs_mount_state_in_use_end(nmp, error);
- return (error);
+ return error;
}
/*
tryagain:
lck_mtx_lock(&np->n_openlock);
TAILQ_FOREACH(nlop, &np->n_lock_owners, nlo_link) {
- if (nlop->nlo_pid != pid)
+ os_ref_count_t newcount;
+
+ if (nlop->nlo_pid != pid) {
continue;
- if (timevalcmp(&nlop->nlo_pid_start, &p->p_start, ==))
+ }
+ if (timevalcmp(&nlop->nlo_pid_start, &p->p_start, ==)) {
break;
+ }
/* stale lock owner... reuse it if we can */
- if (nlop->nlo_refcnt) {
+ if (os_ref_get_count(&nlop->nlo_refcnt)) {
TAILQ_REMOVE(&np->n_lock_owners, nlop, nlo_link);
nlop->nlo_flags &= ~NFS_LOCK_OWNER_LINK;
+ newcount = os_ref_release_locked(&nlop->nlo_refcnt);
lck_mtx_unlock(&np->n_openlock);
goto tryagain;
}
if (!nlop && !newnlop && alloc) {
lck_mtx_unlock(&np->n_openlock);
MALLOC(newnlop, struct nfs_lock_owner *, sizeof(struct nfs_lock_owner), M_TEMP, M_WAITOK);
- if (!newnlop)
- return (NULL);
+ if (!newnlop) {
+ return NULL;
+ }
bzero(newnlop, sizeof(*newnlop));
lck_mtx_init(&newnlop->nlo_lock, nfs_open_grp, LCK_ATTR_NULL);
newnlop->nlo_pid = pid;
}
if (!nlop && newnlop) {
newnlop->nlo_flags |= NFS_LOCK_OWNER_LINK;
+ os_ref_init(&newnlop->nlo_refcnt, NULL);
TAILQ_INSERT_HEAD(&np->n_lock_owners, newnlop, nlo_link);
nlop = newnlop;
}
lck_mtx_unlock(&np->n_openlock);
- if (newnlop && (nlop != newnlop))
+ if (newnlop && (nlop != newnlop)) {
nfs_lock_owner_destroy(newnlop);
+ }
- if (nlop)
+ if (nlop) {
nfs_lock_owner_ref(nlop);
+ }
- return (nlop);
+ return nlop;
}
/*
nfs_lock_owner_ref(struct nfs_lock_owner *nlop)
{
lck_mtx_lock(&nlop->nlo_lock);
- nlop->nlo_refcnt++;
+ os_ref_retain_locked(&nlop->nlo_refcnt);
lck_mtx_unlock(&nlop->nlo_lock);
}
void
nfs_lock_owner_rele(struct nfs_lock_owner *nlop)
{
+ os_ref_count_t newcount;
+
lck_mtx_lock(&nlop->nlo_lock);
- if (nlop->nlo_refcnt < 1)
+ if (os_ref_get_count(&nlop->nlo_refcnt) < 1) {
panic("nfs_lock_owner_rele: no refcnt");
- nlop->nlo_refcnt--;
- if (!nlop->nlo_refcnt && (nlop->nlo_flags & NFS_LOCK_OWNER_BUSY))
+ }
+ newcount = os_ref_release_locked(&nlop->nlo_refcnt);
+ if (!newcount && (nlop->nlo_flags & NFS_LOCK_OWNER_BUSY)) {
panic("nfs_lock_owner_rele: busy");
+ }
/* XXX we may potentially want to clean up idle/unused lock owner structures */
- if (nlop->nlo_refcnt || (nlop->nlo_flags & NFS_LOCK_OWNER_LINK)) {
+ if (newcount || (nlop->nlo_flags & NFS_LOCK_OWNER_LINK)) {
lck_mtx_unlock(&nlop->nlo_lock);
return;
}
nfs_lock_owner_set_busy(struct nfs_lock_owner *nlop, thread_t thd)
{
struct nfsmount *nmp;
- struct timespec ts = {2, 0};
+ struct timespec ts = { .tv_sec = 2, .tv_nsec = 0 };
int error = 0, slpflag;
nmp = nlop->nlo_open_owner->noo_mount;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
slpflag = (NMFLAG(nmp, INTR) && thd) ? PCATCH : 0;
lck_mtx_lock(&nlop->nlo_lock);
while (nlop->nlo_flags & NFS_LOCK_OWNER_BUSY) {
- if ((error = nfs_sigintr(nmp, NULL, thd, 0)))
+ if ((error = nfs_sigintr(nmp, NULL, thd, 0))) {
break;
+ }
nlop->nlo_flags |= NFS_LOCK_OWNER_WANT;
msleep(nlop, &nlop->nlo_lock, slpflag, "nfs_lock_owner_set_busy", &ts);
slpflag = 0;
}
- if (!error)
+ if (!error) {
nlop->nlo_flags |= NFS_LOCK_OWNER_BUSY;
+ }
lck_mtx_unlock(&nlop->nlo_lock);
- return (error);
+ return error;
}
/*
int wanted;
lck_mtx_lock(&nlop->nlo_lock);
- if (!(nlop->nlo_flags & NFS_LOCK_OWNER_BUSY))
+ if (!(nlop->nlo_flags & NFS_LOCK_OWNER_BUSY)) {
panic("nfs_lock_owner_clear_busy");
+ }
wanted = (nlop->nlo_flags & NFS_LOCK_OWNER_WANT);
- nlop->nlo_flags &= ~(NFS_LOCK_OWNER_BUSY|NFS_LOCK_OWNER_WANT);
+ nlop->nlo_flags &= ~(NFS_LOCK_OWNER_BUSY | NFS_LOCK_OWNER_WANT);
lck_mtx_unlock(&nlop->nlo_lock);
- if (wanted)
+ if (wanted) {
wakeup(nlop);
+ }
}
/*
TAILQ_INSERT_HEAD(&nlop->nlo_locks, newnflp, nfl_lolink);
} else {
TAILQ_FOREACH(nflp, &nlop->nlo_locks, nfl_lolink) {
- if (newnflp->nfl_start < nflp->nfl_start)
+ if (newnflp->nfl_start < nflp->nfl_start) {
break;
+ }
}
- if (nflp)
+ if (nflp) {
TAILQ_INSERT_BEFORE(nflp, newnflp, nfl_lolink);
- else
+ } else {
TAILQ_INSERT_TAIL(&nlop->nlo_locks, newnflp, nfl_lolink);
+ }
}
lck_mtx_unlock(&nlop->nlo_lock);
}
lck_mtx_unlock(&nlop->nlo_lock);
if (!nflp) {
MALLOC(nflp, struct nfs_file_lock *, sizeof(struct nfs_file_lock), M_TEMP, M_WAITOK);
- if (!nflp)
- return (NULL);
+ if (!nflp) {
+ return NULL;
+ }
bzero(nflp, sizeof(*nflp));
nflp->nfl_flags |= NFS_FILE_LOCK_ALLOC;
nflp->nfl_owner = nlop;
}
nfs_lock_owner_ref(nlop);
- return (nflp);
+ return nflp;
}
/*
nfs_file_lock_conflict(struct nfs_file_lock *nflp1, struct nfs_file_lock *nflp2, int *willsplit)
{
/* no conflict if lock is dead */
- if ((nflp1->nfl_flags & NFS_FILE_LOCK_DEAD) || (nflp2->nfl_flags & NFS_FILE_LOCK_DEAD))
- return (0);
+ if ((nflp1->nfl_flags & NFS_FILE_LOCK_DEAD) || (nflp2->nfl_flags & NFS_FILE_LOCK_DEAD)) {
+ return 0;
+ }
/* no conflict if it's ours - unless the lock style doesn't match */
if ((nflp1->nfl_owner == nflp2->nfl_owner) &&
((nflp1->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) == (nflp2->nfl_flags & NFS_FILE_LOCK_STYLE_MASK))) {
if (willsplit && (nflp1->nfl_type != nflp2->nfl_type) &&
(nflp1->nfl_start > nflp2->nfl_start) &&
- (nflp1->nfl_end < nflp2->nfl_end))
+ (nflp1->nfl_end < nflp2->nfl_end)) {
*willsplit = 1;
- return (0);
+ }
+ return 0;
}
/* no conflict if ranges don't overlap */
- if ((nflp1->nfl_start > nflp2->nfl_end) || (nflp1->nfl_end < nflp2->nfl_start))
- return (0);
+ if ((nflp1->nfl_start > nflp2->nfl_end) || (nflp1->nfl_end < nflp2->nfl_start)) {
+ return 0;
+ }
/* no conflict if neither lock is exclusive */
- if ((nflp1->nfl_type != F_WRLCK) && (nflp2->nfl_type != F_WRLCK))
- return (0);
+ if ((nflp1->nfl_type != F_WRLCK) && (nflp2->nfl_type != F_WRLCK)) {
+ return 0;
+ }
/* conflict */
- return (1);
+ return 1;
}
+#if CONFIG_NFS4
/*
* Send an NFSv4 LOCK RPC to the server.
*/
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
newlocker = (nlop->nlo_stategenid != nmp->nm_stategenid);
locktype = (nflp->nfl_flags & NFS_FILE_LOCK_WAIT) ?
- ((nflp->nfl_type == F_WRLCK) ?
- NFS_LOCK_TYPE_WRITEW :
- NFS_LOCK_TYPE_READW) :
- ((nflp->nfl_type == F_WRLCK) ?
- NFS_LOCK_TYPE_WRITE :
- NFS_LOCK_TYPE_READ);
+ ((nflp->nfl_type == F_WRLCK) ?
+ NFS_LOCK_TYPE_WRITEW :
+ NFS_LOCK_TYPE_READW) :
+ ((nflp->nfl_type == F_WRLCK) ?
+ NFS_LOCK_TYPE_WRITE :
+ NFS_LOCK_TYPE_READ);
if (newlocker) {
error = nfs_open_file_set_busy(nofp, thd);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
error = nfs_open_owner_set_busy(nofp->nof_owner, thd);
if (error) {
nfs_open_file_clear_busy(nofp);
- return (error);
+ return error;
}
if (!nlop->nlo_open_owner) {
nfs_open_owner_ref(nofp->nof_owner);
nfs_open_owner_clear_busy(nofp->nof_owner);
nfs_open_file_clear_busy(nofp);
}
- return (error);
+ return error;
}
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
- error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, flags|R_NOINTR, &nmrep, &xid, &status);
+ error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, flags | R_NOINTR, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
/* Update the lock owner's stategenid once it appears the server has state for it. */
/* We determine this by noting the request was successful (we got a stateid). */
- if (newlocker && !error)
+ if (newlocker && !error) {
nlop->nlo_stategenid = nmp->nm_stategenid;
+ }
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfs_lock_owner_clear_busy(nlop);
if (newlocker) {
nfs_open_owner_clear_busy(nofp->nof_owner);
}
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
/*
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
error = nfs_lock_owner_set_busy(nlop, NULL);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
- error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, flags|R_NOINTR, &nmrep, &xid, &status);
+ error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, flags | R_NOINTR, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfs_owner_seqid_increment(NULL, nlop, error);
nfsm_chain_get_stateid(error, &nmrep, &nlop->nlo_stateid);
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfs_lock_owner_clear_busy(nlop);
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
/*
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
lockerror = ENOENT;
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
error = nfs_request(np, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
fl->l_type = F_UNLCK;
}
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
-
+#endif /* CONFIG_NFS4 */
/*
* Check for any conflicts with the given lock.
int error = 0, answered = 0;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
restart:
- if ((error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx))))
- return (error);
+ if ((error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx)))) {
+ return error;
+ }
lck_mtx_lock(&np->n_openlock);
/* scan currently held locks for conflict */
TAILQ_FOREACH(nflp, &np->n_locks, nfl_link) {
- if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED|NFS_FILE_LOCK_DEAD))
+ if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED | NFS_FILE_LOCK_DEAD)) {
continue;
+ }
if ((start <= nflp->nfl_end) && (end >= nflp->nfl_start) &&
- ((fl->l_type == F_WRLCK) || (nflp->nfl_type == F_WRLCK)))
+ ((fl->l_type == F_WRLCK) || (nflp->nfl_type == F_WRLCK))) {
break;
+ }
}
if (nflp) {
/* found a conflicting lock */
lck_mtx_unlock(&np->n_openlock);
if (answered) {
nfs_mount_state_in_use_end(nmp, 0);
- return (0);
+ return 0;
}
/* no conflict found locally, so ask the server */
error = nmp->nm_funcs->nf_getlock_rpc(np, nlop, fl, start, end, ctx);
- if (nfs_mount_state_in_use_end(nmp, error))
+ if (nfs_mount_state_in_use_end(nmp, error)) {
goto restart;
- return (error);
+ }
+ return error;
}
/*
struct nfs_file_lock *newnflp, *nflp, *nflp2 = NULL, *nextnflp, *flocknflp = NULL;
struct nfs_file_lock *coalnflp;
int error = 0, error2, willsplit = 0, delay, slpflag, busy = 0, inuse = 0, restart, inqueue = 0;
- struct timespec ts = {1, 0};
+ struct timespec ts = { .tv_sec = 1, .tv_nsec = 0 };
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
slpflag = NMFLAG(nmp, INTR) ? PCATCH : 0;
- if ((type != F_RDLCK) && (type != F_WRLCK))
- return (EINVAL);
+ if ((type != F_RDLCK) && (type != F_WRLCK)) {
+ return EINVAL;
+ }
/* allocate a new lock */
newnflp = nfs_file_lock_alloc(nlop);
- if (!newnflp)
- return (ENOLCK);
+ if (!newnflp) {
+ return ENOLCK;
+ }
newnflp->nfl_start = start;
newnflp->nfl_end = end;
newnflp->nfl_type = type;
- if (op == F_SETLKW)
+ if (op == F_SETLKW) {
newnflp->nfl_flags |= NFS_FILE_LOCK_WAIT;
+ }
newnflp->nfl_flags |= style;
newnflp->nfl_flags |= NFS_FILE_LOCK_BLOCKED;
* have a shared flock-style lock.
*/
nflp = TAILQ_FIRST(&nlop->nlo_locks);
- if (nflp && ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != NFS_FILE_LOCK_STYLE_FLOCK))
+ if (nflp && ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != NFS_FILE_LOCK_STYLE_FLOCK)) {
nflp = NULL;
- if (nflp && (nflp->nfl_type != F_RDLCK))
+ }
+ if (nflp && (nflp->nfl_type != F_RDLCK)) {
nflp = NULL;
+ }
flocknflp = nflp;
}
restart:
restart = 0;
error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
- if (error)
+ if (error) {
goto error_out;
+ }
inuse = 1;
if (np->n_flag & NREVOKE) {
error = EIO;
inuse = 0;
goto error_out;
}
+#if CONFIG_NFS4
if (nofp->nof_flags & NFS_OPEN_FILE_REOPEN) {
nfs_mount_state_in_use_end(nmp, 0);
inuse = 0;
error = nfs4_reopen(nofp, vfs_context_thread(ctx));
- if (error)
+ if (error) {
goto error_out;
+ }
goto restart;
}
+#endif
lck_mtx_lock(&np->n_openlock);
if (!inqueue) {
/* scan current list of locks (held and pending) for conflicts */
for (nflp = TAILQ_NEXT(newnflp, nfl_link); nflp; nflp = nextnflp) {
nextnflp = TAILQ_NEXT(nflp, nfl_link);
- if (!nfs_file_lock_conflict(newnflp, nflp, &willsplit))
+ if (!nfs_file_lock_conflict(newnflp, nflp, &willsplit)) {
continue;
+ }
/* Conflict */
if (!(newnflp->nfl_flags & NFS_FILE_LOCK_WAIT)) {
error = EAGAIN;
inuse = 0;
error = nfs_advlock_unlock(np, nofp, nlop, 0, UINT64_MAX, NFS_FILE_LOCK_STYLE_FLOCK, ctx);
flocknflp = NULL;
- if (!error)
+ if (!error) {
error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
+ }
if (error) {
lck_mtx_lock(&np->n_openlock);
break;
inuse = 1;
lck_mtx_lock(&np->n_openlock);
/* no need to block/sleep if the conflict is gone */
- if (!nfs_file_lock_conflict(newnflp, nflp, NULL))
+ if (!nfs_file_lock_conflict(newnflp, nflp, NULL)) {
break;
+ }
}
msleep(nflp, &np->n_openlock, slpflag, "nfs_advlock_setlock_blocked", &ts);
slpflag = 0;
lck_mtx_lock(&np->n_openlock);
break;
}
- if (!error && (np->n_flag & NREVOKE))
+ if (!error && (np->n_flag & NREVOKE)) {
error = EIO;
+ }
} while (!error && nfs_file_lock_conflict(newnflp, nflp, NULL));
nflp->nfl_blockcnt--;
if ((nflp->nfl_flags & NFS_FILE_LOCK_DEAD) && !nflp->nfl_blockcnt) {
TAILQ_REMOVE(&np->n_locks, nflp, nfl_link);
nfs_file_lock_destroy(nflp);
}
- if (error || restart)
+ if (error || restart) {
break;
+ }
/* We have released n_openlock and we can't trust that nextnflp is still valid. */
/* So, start this lock-scanning loop over from where it started. */
nextnflp = TAILQ_NEXT(newnflp, nfl_link);
}
lck_mtx_unlock(&np->n_openlock);
- if (restart)
+ if (restart) {
goto restart;
- if (error)
+ }
+ if (error) {
goto error_out;
+ }
if (willsplit) {
/*
}
/* once scan for local conflicts is clear, send request to server */
- if ((error = nfs_open_state_set_busy(np, vfs_context_thread(ctx))))
+ if ((error = nfs_open_state_set_busy(np, vfs_context_thread(ctx)))) {
goto error_out;
+ }
busy = 1;
delay = 0;
do {
+#if CONFIG_NFS4
/* do we have a delegation? (that we're not returning?) */
if ((np->n_openflags & N_DELEG_MASK) && !(np->n_openflags & N_DELEG_RETURN)) {
if (np->n_openflags & N_DELEG_WRITE) {
* with an open it knows about.
*/
if ((!nofp->nof_rw_drw && !nofp->nof_w_drw && !nofp->nof_r_drw &&
- !nofp->nof_rw_dw && !nofp->nof_w_dw && !nofp->nof_r_dw &&
- !nofp->nof_rw && !nofp->nof_w && !nofp->nof_r) &&
+ !nofp->nof_rw_dw && !nofp->nof_w_dw && !nofp->nof_r_dw &&
+ !nofp->nof_rw && !nofp->nof_w && !nofp->nof_r) &&
(nofp->nof_d_rw_drw || nofp->nof_d_w_drw || nofp->nof_d_r_drw ||
- nofp->nof_d_rw_dw || nofp->nof_d_w_dw || nofp->nof_d_r_dw ||
- nofp->nof_d_rw || nofp->nof_d_w || nofp->nof_d_r)) {
+ nofp->nof_d_rw_dw || nofp->nof_d_w_dw || nofp->nof_d_r_dw ||
+ nofp->nof_d_rw || nofp->nof_d_w || nofp->nof_d_r)) {
error = nfs4_claim_delegated_state_for_open_file(nofp, 0);
- if (error)
+ if (error) {
break;
+ }
}
}
}
- if (np->n_flag & NREVOKE)
+#endif
+ if (np->n_flag & NREVOKE) {
error = EIO;
- if (!error)
+ }
+ if (!error) {
error = nmp->nm_funcs->nf_setlock_rpc(np, nofp, newnflp, 0, 0, vfs_context_thread(ctx), vfs_context_ucred(ctx));
- if (!error || ((error != NFSERR_DENIED) && (error != NFSERR_GRACE)))
+ }
+ if (!error || ((error != NFSERR_DENIED) && (error != NFSERR_GRACE))) {
break;
+ }
/* request was denied due to either conflict or grace period */
if ((error == NFSERR_DENIED) && !(newnflp->nfl_flags & NFS_FILE_LOCK_WAIT)) {
error = EAGAIN;
inuse = 0;
error2 = nfs_advlock_unlock(np, nofp, nlop, 0, UINT64_MAX, NFS_FILE_LOCK_STYLE_FLOCK, ctx);
flocknflp = NULL;
- if (!error2)
+ if (!error2) {
error2 = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
+ }
if (!error2) {
inuse = 1;
error2 = nfs_open_state_set_busy(np, vfs_context_thread(ctx));
* Except for retries of blocked v2/v3 request where we've already waited a bit.
*/
if ((nmp->nm_vers >= NFS_VER4) || (error == NFSERR_GRACE)) {
- if (error == NFSERR_GRACE)
+ if (error == NFSERR_GRACE) {
delay = 4;
- if (delay < 4)
+ }
+ if (delay < 4) {
delay++;
- tsleep(newnflp, slpflag, "nfs_advlock_setlock_delay", delay * (hz/2));
+ }
+ tsleep(newnflp, slpflag, "nfs_advlock_setlock_delay", delay * (hz / 2));
slpflag = 0;
}
error = nfs_sigintr(NFSTONMP(np), NULL, vfs_context_thread(ctx), 0);
inuse = 0;
goto restart;
}
- if (!error && (np->n_flag & NREVOKE))
+ if (!error && (np->n_flag & NREVOKE)) {
error = EIO;
+ }
} while (!error);
error_out:
wakeup(newnflp);
} else {
/* remove newnflp from lock list and destroy */
- if (inqueue)
+ if (inqueue) {
TAILQ_REMOVE(&np->n_locks, newnflp, nfl_link);
+ }
nfs_file_lock_destroy(newnflp);
}
lck_mtx_unlock(&np->n_openlock);
- if (busy)
+ if (busy) {
nfs_open_state_clear_busy(np);
- if (inuse)
+ }
+ if (inuse) {
nfs_mount_state_in_use_end(nmp, error);
- if (nflp2)
+ }
+ if (nflp2) {
nfs_file_lock_destroy(nflp2);
- return (error);
+ }
+ return error;
}
/* server granted the lock */
* It's possible that a single lock may need to be split.
*/
TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
- if (nflp == newnflp)
+ if (nflp == newnflp) {
continue;
- if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED|NFS_FILE_LOCK_DEAD))
+ }
+ if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED | NFS_FILE_LOCK_DEAD)) {
continue;
- if (nflp->nfl_owner != nlop)
+ }
+ if (nflp->nfl_owner != nlop) {
continue;
- if ((newnflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != (nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK))
+ }
+ if ((newnflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != (nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK)) {
continue;
- if ((newnflp->nfl_start > nflp->nfl_end) || (newnflp->nfl_end < nflp->nfl_start))
+ }
+ if ((newnflp->nfl_start > nflp->nfl_end) || (newnflp->nfl_end < nflp->nfl_start)) {
continue;
+ }
/* here's one to update */
if ((newnflp->nfl_start <= nflp->nfl_start) && (newnflp->nfl_end >= nflp->nfl_end)) {
/* The entire lock is being replaced. */
/* We're replacing a range in the middle of a lock. */
/* The current lock will be split into two locks. */
/* Update locks and insert new lock after current lock. */
- nflp2->nfl_flags |= (nflp->nfl_flags & (NFS_FILE_LOCK_STYLE_MASK|NFS_FILE_LOCK_DELEGATED));
+ nflp2->nfl_flags |= (nflp->nfl_flags & (NFS_FILE_LOCK_STYLE_MASK | NFS_FILE_LOCK_DELEGATED));
nflp2->nfl_type = nflp->nfl_type;
nflp2->nfl_start = newnflp->nfl_end + 1;
nflp2->nfl_end = nflp->nfl_end;
* checking locks that are further down the list.
*/
TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
- if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED|NFS_FILE_LOCK_DEAD))
+ if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED | NFS_FILE_LOCK_DEAD)) {
continue;
- if (nflp->nfl_owner != nlop)
+ }
+ if (nflp->nfl_owner != nlop) {
continue;
- if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != NFS_FILE_LOCK_STYLE_POSIX)
+ }
+ if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != NFS_FILE_LOCK_STYLE_POSIX) {
continue;
+ }
if (((coalnflp = TAILQ_PREV(nflp, nfs_file_lock_queue, nfl_lolink))) &&
((coalnflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) == NFS_FILE_LOCK_STYLE_POSIX) &&
(coalnflp->nfl_type == nflp->nfl_type) &&
TAILQ_REMOVE(&nlop->nlo_locks, nflp, nfl_lolink);
lck_mtx_unlock(&nlop->nlo_lock);
}
- if (!(nflp->nfl_flags & NFS_FILE_LOCK_DEAD))
+ if (!(nflp->nfl_flags & NFS_FILE_LOCK_DEAD)) {
continue;
+ }
if (nflp->nfl_blockcnt) {
/* wake up anyone blocked on this lock */
wakeup(nflp);
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, error);
- if (nflp2)
+ if (nflp2) {
nfs_file_lock_destroy(nflp2);
- return (error);
+ }
+ return error;
}
/*
int
nfs_advlock_unlock(
nfsnode_t np,
- struct nfs_open_file *nofp,
+ struct nfs_open_file *nofp
+#if !CONFIG_NFS4
+ __unused
+#endif
+ ,
struct nfs_lock_owner *nlop,
uint64_t start,
uint64_t end,
int error = 0, willsplit = 0, send_unlock_rpcs = 1;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
restart:
- if ((error = nfs_mount_state_in_use_start(nmp, NULL)))
- return (error);
+ if ((error = nfs_mount_state_in_use_start(nmp, NULL))) {
+ return error;
+ }
+#if CONFIG_NFS4
if (nofp->nof_flags & NFS_OPEN_FILE_REOPEN) {
nfs_mount_state_in_use_end(nmp, 0);
error = nfs4_reopen(nofp, NULL);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
goto restart;
}
+#endif
if ((error = nfs_open_state_set_busy(np, NULL))) {
nfs_mount_state_in_use_end(nmp, error);
- return (error);
+ return error;
}
lck_mtx_lock(&np->n_openlock);
* going to be one, we'll allocate one now.
*/
TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
- if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED|NFS_FILE_LOCK_DEAD))
+ if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED | NFS_FILE_LOCK_DEAD)) {
continue;
- if (nflp->nfl_owner != nlop)
+ }
+ if (nflp->nfl_owner != nlop) {
continue;
- if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != style)
+ }
+ if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != style) {
continue;
- if ((start > nflp->nfl_end) || (end < nflp->nfl_start))
+ }
+ if ((start > nflp->nfl_end) || (end < nflp->nfl_start)) {
continue;
+ }
if ((start > nflp->nfl_start) && (end < nflp->nfl_end)) {
willsplit = 1;
break;
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, 0);
newnflp = nfs_file_lock_alloc(nlop);
- if (!newnflp)
- return (ENOMEM);
+ if (!newnflp) {
+ return ENOMEM;
+ }
goto restart;
}
}
* Free all of our locks in the given range.
*
* Note that this process requires sending requests to the server.
- * Because of this, we will release the n_openlock while performing
+ * Because of this, we will release the n_openlock while performing
* the unlock RPCs. The N_OPENBUSY state keeps the state of *held*
* locks from changing underneath us. However, other entries in the
* list may be removed. So we need to be careful walking the list.
*/
if ((style == NFS_FILE_LOCK_STYLE_POSIX) &&
((nflp = TAILQ_FIRST(&nlop->nlo_locks))) &&
- ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) == NFS_FILE_LOCK_STYLE_FLOCK))
+ ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) == NFS_FILE_LOCK_STYLE_FLOCK)) {
send_unlock_rpcs = 0;
+ }
if ((style == NFS_FILE_LOCK_STYLE_FLOCK) &&
((nflp = TAILQ_FIRST(&nlop->nlo_locks))) &&
((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) == NFS_FILE_LOCK_STYLE_FLOCK) &&
if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) == NFS_FILE_LOCK_STYLE_POSIX) {
/* unlock the range preceding this lock */
lck_mtx_unlock(&np->n_openlock);
- error = nmp->nm_funcs->nf_unlock_rpc(np, nlop, type, s, nflp->nfl_start-1, 0,
- vfs_context_thread(ctx), vfs_context_ucred(ctx));
+ error = nmp->nm_funcs->nf_unlock_rpc(np, nlop, type, s, nflp->nfl_start - 1, 0,
+ vfs_context_thread(ctx), vfs_context_ucred(ctx));
if (nfs_mount_state_error_should_restart(error)) {
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, error);
goto restart;
}
lck_mtx_lock(&np->n_openlock);
- if (error)
+ if (error) {
goto out;
- s = nflp->nfl_end+1;
+ }
+ s = nflp->nfl_end + 1;
}
nflp = TAILQ_NEXT(nflp, nfl_lolink);
}
if (!delegated) {
lck_mtx_unlock(&np->n_openlock);
error = nmp->nm_funcs->nf_unlock_rpc(np, nlop, type, s, end, 0,
- vfs_context_thread(ctx), vfs_context_ucred(ctx));
+ vfs_context_thread(ctx), vfs_context_ucred(ctx));
if (nfs_mount_state_error_should_restart(error)) {
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, error);
goto restart;
}
lck_mtx_lock(&np->n_openlock);
- if (error)
+ if (error) {
goto out;
+ }
}
send_unlock_rpcs = 0;
}
TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
- if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED|NFS_FILE_LOCK_DEAD))
+ if (nflp->nfl_flags & (NFS_FILE_LOCK_BLOCKED | NFS_FILE_LOCK_DEAD)) {
continue;
- if (nflp->nfl_owner != nlop)
+ }
+ if (nflp->nfl_owner != nlop) {
continue;
- if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != style)
+ }
+ if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != style) {
continue;
- if ((start > nflp->nfl_end) || (end < nflp->nfl_start))
+ }
+ if ((start > nflp->nfl_end) || (end < nflp->nfl_start)) {
continue;
+ }
/* here's one to unlock */
if ((start <= nflp->nfl_start) && (end >= nflp->nfl_end)) {
/* The entire lock is being unlocked. */
if (send_unlock_rpcs && !(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED)) {
lck_mtx_unlock(&np->n_openlock);
error = nmp->nm_funcs->nf_unlock_rpc(np, nlop, nflp->nfl_type, nflp->nfl_start, nflp->nfl_end, 0,
- vfs_context_thread(ctx), vfs_context_ucred(ctx));
+ vfs_context_thread(ctx), vfs_context_ucred(ctx));
if (nfs_mount_state_error_should_restart(error)) {
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, error);
lck_mtx_lock(&np->n_openlock);
}
nextnflp = TAILQ_NEXT(nflp, nfl_link);
- if (error)
+ if (error) {
break;
+ }
nflp->nfl_flags |= NFS_FILE_LOCK_DEAD;
lck_mtx_lock(&nlop->nlo_lock);
TAILQ_REMOVE(&nlop->nlo_locks, nflp, nfl_lolink);
if (send_unlock_rpcs && !(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED)) {
lck_mtx_unlock(&np->n_openlock);
error = nmp->nm_funcs->nf_unlock_rpc(np, nlop, nflp->nfl_type, start, end, 0,
- vfs_context_thread(ctx), vfs_context_ucred(ctx));
+ vfs_context_thread(ctx), vfs_context_ucred(ctx));
if (nfs_mount_state_error_should_restart(error)) {
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, error);
}
lck_mtx_lock(&np->n_openlock);
}
- if (error)
+ if (error) {
break;
+ }
/* update locks and insert new lock after current lock */
- newnflp->nfl_flags |= (nflp->nfl_flags & (NFS_FILE_LOCK_STYLE_MASK|NFS_FILE_LOCK_DELEGATED));
+ newnflp->nfl_flags |= (nflp->nfl_flags & (NFS_FILE_LOCK_STYLE_MASK | NFS_FILE_LOCK_DELEGATED));
newnflp->nfl_type = nflp->nfl_type;
newnflp->nfl_start = end + 1;
newnflp->nfl_end = nflp->nfl_end;
if (send_unlock_rpcs && !(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED)) {
lck_mtx_unlock(&np->n_openlock);
error = nmp->nm_funcs->nf_unlock_rpc(np, nlop, nflp->nfl_type, start, nflp->nfl_end, 0,
- vfs_context_thread(ctx), vfs_context_ucred(ctx));
+ vfs_context_thread(ctx), vfs_context_ucred(ctx));
if (nfs_mount_state_error_should_restart(error)) {
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, error);
lck_mtx_lock(&np->n_openlock);
}
nextnflp = TAILQ_NEXT(nflp, nfl_link);
- if (error)
+ if (error) {
break;
+ }
nflp->nfl_end = start - 1;
} else if (end < nflp->nfl_end) {
/* We're unlocking the start of a lock. */
if (send_unlock_rpcs && !(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED)) {
lck_mtx_unlock(&np->n_openlock);
error = nmp->nm_funcs->nf_unlock_rpc(np, nlop, nflp->nfl_type, nflp->nfl_start, end, 0,
- vfs_context_thread(ctx), vfs_context_ucred(ctx));
+ vfs_context_thread(ctx), vfs_context_ucred(ctx));
if (nfs_mount_state_error_should_restart(error)) {
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, error);
lck_mtx_lock(&np->n_openlock);
}
nextnflp = TAILQ_NEXT(nflp, nfl_link);
- if (error)
+ if (error) {
break;
+ }
nflp->nfl_start = end + 1;
}
if (nflp->nfl_blockcnt) {
nfs_open_state_clear_busy(np);
nfs_mount_state_in_use_end(nmp, 0);
- if (newnflp)
+ if (newnflp) {
nfs_file_lock_destroy(newnflp);
- return (error);
+ }
+ return error;
}
/*
int
nfs_vnop_advlock(
struct vnop_advlock_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- caddr_t a_id;
- int a_op;
- struct flock *a_fl;
- int a_flags;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * caddr_t a_id;
+ * int a_op;
+ * struct flock *a_fl;
+ * int a_flags;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vnode_t vp = ap->a_vp;
nfsnode_t np = VTONFS(ap->a_vp);
#define OFF_MAX QUAD_MAX
nmp = VTONMP(ap->a_vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
lck_mtx_lock(&nmp->nm_lock);
if ((nmp->nm_vers <= NFS_VER3) && (nmp->nm_lockmode == NFS_LOCK_MODE_DISABLED)) {
lck_mtx_unlock(&nmp->nm_lock);
- return (ENOTSUP);
+ return ENOTSUP;
}
lck_mtx_unlock(&nmp->nm_lock);
- if (np->n_flag & NREVOKE)
- return (EIO);
+ if (np->n_flag & NREVOKE) {
+ return EIO;
+ }
vtype = vnode_vtype(ap->a_vp);
- if (vtype == VDIR) /* ignore lock requests on directories */
- return (0);
- if (vtype != VREG) /* anything other than regular files is invalid */
- return (EINVAL);
+ if (vtype == VDIR) { /* ignore lock requests on directories */
+ return 0;
+ }
+ if (vtype != VREG) { /* anything other than regular files is invalid */
+ return EINVAL;
+ }
/* Convert the flock structure into a start and end. */
switch (fl->l_whence) {
case SEEK_END:
/* need to flush, and refetch attributes to make */
/* sure we have the correct end of file offset */
- if ((error = nfs_node_lock(np)))
- return (error);
+ if ((error = nfs_node_lock(np))) {
+ return error;
+ }
modified = (np->n_flag & NMODIFIED);
nfs_node_unlock(np);
- if (modified && ((error = nfs_vinvalbuf(vp, V_SAVE, ctx, 1))))
- return (error);
- if ((error = nfs_getattr(np, NULL, ctx, NGA_UNCACHED)))
- return (error);
+ if (modified && ((error = nfs_vinvalbuf(vp, V_SAVE, ctx, 1)))) {
+ return error;
+ }
+ if ((error = nfs_getattr(np, NULL, ctx, NGA_UNCACHED))) {
+ return error;
+ }
nfs_data_lock(np, NFS_DATA_LOCK_SHARED);
if ((np->n_size > OFF_MAX) ||
- ((fl->l_start > 0) && (np->n_size > (u_quad_t)(OFF_MAX - fl->l_start))))
+ ((fl->l_start > 0) && (np->n_size > (u_quad_t)(OFF_MAX - fl->l_start)))) {
error = EOVERFLOW;
+ }
lstart = np->n_size + fl->l_start;
nfs_data_unlock(np);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
break;
default:
- return (EINVAL);
+ return EINVAL;
+ }
+ if (lstart < 0) {
+ return EINVAL;
}
- if (lstart < 0)
- return (EINVAL);
start = lstart;
if (fl->l_len == 0) {
end = UINT64_MAX;
} else if (fl->l_len > 0) {
- if ((fl->l_len - 1) > (OFF_MAX - lstart))
- return (EOVERFLOW);
+ if ((fl->l_len - 1) > (OFF_MAX - lstart)) {
+ return EOVERFLOW;
+ }
end = start - 1 + fl->l_len;
} else { /* l_len is negative */
- if ((lstart + fl->l_len) < 0)
- return (EINVAL);
+ if ((lstart + fl->l_len) < 0) {
+ return EINVAL;
+ }
end = start - 1;
start += fl->l_len;
}
- if ((nmp->nm_vers == NFS_VER2) && ((start > INT32_MAX) || (fl->l_len && (end > INT32_MAX))))
- return (EINVAL);
+ if ((nmp->nm_vers == NFS_VER2) && ((start > INT32_MAX) || (fl->l_len && (end > INT32_MAX)))) {
+ return EINVAL;
+ }
style = (flags & F_FLOCK) ? NFS_FILE_LOCK_STYLE_FLOCK : NFS_FILE_LOCK_STYLE_POSIX;
- if ((style == NFS_FILE_LOCK_STYLE_FLOCK) && ((start != 0) || (end != UINT64_MAX)))
- return (EINVAL);
+ if ((style == NFS_FILE_LOCK_STYLE_FLOCK) && ((start != 0) || (end != UINT64_MAX))) {
+ return EINVAL;
+ }
/* find the lock owner, alloc if not unlock */
nlop = nfs_lock_owner_find(np, vfs_context_proc(ctx), (op != F_UNLCK));
if (!nlop) {
error = (op == F_UNLCK) ? 0 : ENOMEM;
- if (error)
+ if (error) {
NP(np, "nfs_vnop_advlock: no lock owner, error %d", error);
+ }
goto out;
}
goto out;
}
/* find the open file */
+#if CONFIG_NFS4
restart:
+#endif
error = nfs_open_file_find(np, noop, &nofp, 0, 0, 0);
- if (error)
+ if (error) {
error = EBADF;
+ }
if (!error && (nofp->nof_flags & NFS_OPEN_FILE_LOST)) {
NP(np, "nfs_vnop_advlock: LOST %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
error = EIO;
}
+#if CONFIG_NFS4
if (!error && (nofp->nof_flags & NFS_OPEN_FILE_REOPEN)) {
error = nfs4_reopen(nofp, ((op == F_UNLCK) ? NULL : vfs_context_thread(ctx)));
nofp = NULL;
- if (!error)
+ if (!error) {
goto restart;
+ }
}
+#endif
if (error) {
NP(np, "nfs_vnop_advlock: no open file %d, %d", error, kauth_cred_getuid(noop->noo_cred));
goto out;
if (op == F_UNLCK) {
error = nfs_advlock_unlock(np, nofp, nlop, start, end, style, ctx);
} else if ((op == F_SETLK) || (op == F_SETLKW)) {
- if ((op == F_SETLK) && (flags & F_WAIT))
+ if ((op == F_SETLK) && (flags & F_WAIT)) {
op = F_SETLKW;
+ }
error = nfs_advlock_setlock(np, nofp, nlop, op, start, end, style, fl->l_type, ctx);
} else {
/* not getlk, unlock or lock? */
}
out:
- if (nlop)
+ if (nlop) {
nfs_lock_owner_rele(nlop);
- if (noop)
+ }
+ if (noop) {
nfs_open_owner_rele(noop);
- return (error);
+ }
+ return error;
}
/*
struct nfs_lock_owner *nlop;
TAILQ_FOREACH(nlop, &nofp->nof_np->n_lock_owners, nlo_link) {
- if (nlop->nlo_open_owner != noop)
+ if (nlop->nlo_open_owner != noop) {
continue;
- if (!TAILQ_EMPTY(&nlop->nlo_locks))
+ }
+ if (!TAILQ_EMPTY(&nlop->nlo_locks)) {
break;
+ }
}
- return (nlop ? 1 : 0);
+ return nlop ? 1 : 0;
}
+#if CONFIG_NFS4
/*
* Reopen simple (no deny, no locks) open state that was lost.
*/
char smallname[128];
char *filename = NULL;
int error = 0, done = 0, slpflag = NMFLAG(nmp, INTR) ? PCATCH : 0;
- struct timespec ts = { 1, 0 };
+ struct timespec ts = { .tv_sec = 1, .tv_nsec = 0 };
lck_mtx_lock(&nofp->nof_lock);
while (nofp->nof_flags & NFS_OPEN_FILE_REOPENING) {
- if ((error = nfs_sigintr(nmp, NULL, thd, 0)))
+ if ((error = nfs_sigintr(nmp, NULL, thd, 0))) {
break;
- msleep(&nofp->nof_flags, &nofp->nof_lock, slpflag|(PZERO-1), "nfsreopenwait", &ts);
+ }
+ msleep(&nofp->nof_flags, &nofp->nof_lock, slpflag | (PZERO - 1), "nfsreopenwait", &ts);
slpflag = 0;
}
if (error || !(nofp->nof_flags & NFS_OPEN_FILE_REOPEN)) {
lck_mtx_unlock(&nofp->nof_lock);
- return (error);
+ return error;
}
nofp->nof_flags |= NFS_OPEN_FILE_REOPENING;
lck_mtx_unlock(&nofp->nof_lock);
struct nfs_sillyrename *nsp = np->n_sillyrename;
dvp = NFSTOV(nsp->nsr_dnp);
if ((error = vnode_get(dvp))) {
+ dvp = NULLVP;
nfs_node_unlock(np);
goto out;
}
* from the n_parent we have stashed away.
*/
if ((np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) &&
- (((dvp = np->n_parent)) && (error = vnode_get(dvp))))
+ (((dvp = np->n_parent)) && (error = vnode_get(dvp)))) {
dvp = NULL;
- if (!dvp)
+ }
+ if (!dvp) {
dvp = vnode_getparent(vp);
+ }
vname = vnode_getname(vp);
if (!dvp || !vname) {
- if (!error)
+ if (!error) {
error = EIO;
+ }
nfs_node_unlock(np);
goto out;
}
filename = &smallname[0];
namelen = snprintf(filename, sizeof(smallname), "%s", name);
if (namelen >= sizeof(smallname)) {
- MALLOC(filename, char *, namelen+1, M_TEMP, M_WAITOK);
+ MALLOC(filename, char *, namelen + 1, M_TEMP, M_WAITOK);
if (!filename) {
error = ENOMEM;
goto out;
}
- snprintf(filename, namelen+1, "%s", name);
+ snprintf(filename, namelen + 1, "%s", name);
}
nfs_node_unlock(np);
bzero(&cn, sizeof(cn));
restart:
done = 0;
- if ((error = nfs_mount_state_in_use_start(nmp, thd)))
+ if ((error = nfs_mount_state_in_use_start(nmp, thd))) {
goto out;
+ }
- if (nofp->nof_rw)
+ if (nofp->nof_rw) {
error = nfs4_open_reopen_rpc(nofp, thd, noop->noo_cred, &cn, dvp, &vp, NFS_OPEN_SHARE_ACCESS_BOTH, NFS_OPEN_SHARE_DENY_NONE);
- if (!error && nofp->nof_w)
+ }
+ if (!error && nofp->nof_w) {
error = nfs4_open_reopen_rpc(nofp, thd, noop->noo_cred, &cn, dvp, &vp, NFS_OPEN_SHARE_ACCESS_WRITE, NFS_OPEN_SHARE_DENY_NONE);
- if (!error && nofp->nof_r)
+ }
+ if (!error && nofp->nof_r) {
error = nfs4_open_reopen_rpc(nofp, thd, noop->noo_cred, &cn, dvp, &vp, NFS_OPEN_SHARE_ACCESS_READ, NFS_OPEN_SHARE_DENY_NONE);
+ }
if (nfs_mount_state_in_use_end(nmp, error)) {
- if (error == NFSERR_GRACE)
+ if (error == NFSERR_GRACE) {
goto restart;
+ }
printf("nfs4_reopen: RPC failed, error %d, lost %d, %s\n", error,
- (nofp->nof_flags & NFS_OPEN_FILE_LOST) ? 1 : 0, name ? name : "???");
+ (nofp->nof_flags & NFS_OPEN_FILE_LOST) ? 1 : 0, name ? name : "???");
error = 0;
goto out;
}
done = 1;
out:
- if (error && (error != EINTR) && (error != ERESTART))
+ if (error && (error != EINTR) && (error != ERESTART)) {
nfs_revoke_open_state_for_node(np);
+ }
lck_mtx_lock(&nofp->nof_lock);
nofp->nof_flags &= ~NFS_OPEN_FILE_REOPENING;
- if (done)
+ if (done) {
nofp->nof_flags &= ~NFS_OPEN_FILE_REOPEN;
- else if (error)
+ } else if (error) {
printf("nfs4_reopen: failed, error %d, lost %d, %s\n", error,
- (nofp->nof_flags & NFS_OPEN_FILE_LOST) ? 1 : 0, name ? name : "???");
+ (nofp->nof_flags & NFS_OPEN_FILE_LOST) ? 1 : 0, name ? name : "???");
+ }
lck_mtx_unlock(&nofp->nof_lock);
- if (filename && (filename != &smallname[0]))
+ if (filename && (filename != &smallname[0])) {
FREE(filename, M_TEMP);
- if (vname)
+ }
+ if (vname) {
vnode_putname(vname);
- if (dvp != NULLVP)
+ }
+ if (dvp != NULLVP) {
vnode_put(dvp);
- return (error);
+ }
+ return error;
}
/*
int share_access,
int share_deny)
{
- return (nfs4_open_rpc_internal(nofp, ctx, vfs_context_thread(ctx), vfs_context_ucred(ctx),
- cnp, vap, dvp, vpp, create, share_access, share_deny));
+ return nfs4_open_rpc_internal(nofp, ctx, vfs_context_thread(ctx), vfs_context_ucred(ctx),
+ cnp, vap, dvp, vpp, create, share_access, share_deny);
}
/*
int share_access,
int share_deny)
{
- return (nfs4_open_rpc_internal(nofp, NULL, thd, cred, cnp, NULL, dvp, vpp, NFS_OPEN_NOCREATE, share_access, share_deny));
+ return nfs4_open_rpc_internal(nofp, NULL, thd, cred, cnp, NULL, dvp, vpp, NFS_OPEN_NOCREATE, share_access, share_deny);
}
/*
nfsmout:
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
/*
struct kauth_ace ace;
struct nfsreq_secinfo_args si;
- if (create && !ctx)
- return (EINVAL);
+ if (create && !ctx) {
+ return EINVAL;
+ }
nmp = VTONMP(dvp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
namedattrs = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR);
- if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
np = *vpp ? VTONFS(*vpp) : NULL;
if (create && vap) {
nfs_avoid_needless_id_setting_on_create(dnp, vap, ctx);
gotuid = VATTR_IS_ACTIVE(vap, va_uid);
gotgid = VATTR_IS_ACTIVE(vap, va_gid);
- if (exclusive && (!VATTR_IS_ACTIVE(vap, va_access_time) || !VATTR_IS_ACTIVE(vap, va_modify_time)))
+ if (exclusive && (!VATTR_IS_ACTIVE(vap, va_access_time) || !VATTR_IS_ACTIVE(vap, va_modify_time))) {
vap->va_vaflags |= VA_UTIMES_NULL;
+ }
} else {
exclusive = gotuid = gotgid = 0;
}
sid = &stateid;
}
- if ((error = nfs_open_owner_set_busy(noop, thd)))
- return (error);
+ if ((error = nfs_open_owner_set_busy(noop, thd))) {
+ return error;
+ }
again:
rflags = delegation = recall = 0;
ace.ace_flags = 0;
nfsm_chain_add_bitmap_supported(error, &nmreq, nfs_getattr_bitmap, nmp, dnp);
nfsm_chain_build_done(error, &nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
- if (!error)
+ if (!error) {
error = busyerror = nfs_node_set_busy(dnp, thd);
+ }
nfsmout_if(error);
- if (create && !namedattrs)
+ if (create && !namedattrs) {
nfs_dulookup_init(&dul, dnp, cnp->cn_nameptr, cnp->cn_namelen, ctx);
+ }
error = nfs_request_async(dnp, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, R_NOINTR, NULL, &req);
if (!error) {
- if (create && !namedattrs)
+ if (create && !namedattrs) {
nfs_dulookup_start(&dul, dnp, ctx);
+ }
error = nfs_request_async_finish(req, &nmrep, &xid, &status);
savedxid = xid;
}
- if (create && !namedattrs)
+ if (create && !namedattrs) {
nfs_dulookup_finish(&dul, dnp, ctx);
+ }
- if ((lockerror = nfs_node_lock(dnp)))
+ if ((lockerror = nfs_node_lock(dnp))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
bmlen = NFS_ATTR_BITMAP_LEN;
nfsm_chain_get_bitmap(error, &nmrep, bitmap, bmlen);
nfsm_chain_get_32(error, &nmrep, delegation);
- if (!error)
+ if (!error) {
switch (delegation) {
case NFS_OPEN_DELEGATE_NONE:
break;
case NFS_OPEN_DELEGATE_WRITE:
nfsm_chain_get_stateid(error, &nmrep, &dstateid);
nfsm_chain_get_32(error, &nmrep, recall);
- if (delegation == NFS_OPEN_DELEGATE_WRITE) // space (skip) XXX
+ if (delegation == NFS_OPEN_DELEGATE_WRITE) { // space (skip) XXX
nfsm_chain_adv(error, &nmrep, 3 * NFSX_UNSIGNED);
+ }
/* if we have any trouble accepting the ACE, just invalidate it */
ace_type = ace_flags = ace_mask = len = 0;
nfsm_chain_get_32(error, &nmrep, ace_type);
ace.ace_flags |= nfs4_ace_nfsflags_to_vfsflags(ace_flags);
ace.ace_rights = nfs4_ace_nfsmask_to_vfsrights(ace_mask);
if (!error && (len >= slen)) {
- MALLOC(s, char*, len+1, M_TEMP, M_WAITOK);
- if (s)
- slen = len+1;
- else
+ MALLOC(s, char*, len + 1, M_TEMP, M_WAITOK);
+ if (s) {
+ slen = len + 1;
+ } else {
ace.ace_flags = 0;
+ }
}
- if (s)
+ if (s) {
nfsm_chain_get_opaque(error, &nmrep, len, s);
- else
+ } else {
nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
+ }
if (!error && s) {
s[len] = '\0';
- if (nfs4_id2guid(s, &ace.ace_applicable, (ace_flags & NFS_ACE_IDENTIFIER_GROUP)))
+ if (nfs4_id2guid(s, &ace.ace_applicable, (ace_flags & NFS_ACE_IDENTIFIER_GROUP))) {
ace.ace_flags = 0;
+ }
}
- if (error || !s)
+ if (error || !s) {
ace.ace_flags = 0;
- if (s && (s != sbuf))
+ }
+ if (s && (s != sbuf)) {
FREE(s, M_TEMP);
+ }
break;
default:
error = EBADRPC;
break;
}
+ }
/* At this point if we have no error, the object was created/opened. */
open_error = error;
nfsmout_if(error);
- if (create && vap && !exclusive)
+ if (create && vap && !exclusive) {
nfs_vattr_set_supported(bitmap, vap);
+ }
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsmout_if(error);
error = nfs4_parsefattr(&nmrep, NULL, &nvattr, &fh, NULL, NULL);
if (!create && np && !NFS_CMPFH(np, fh.fh_data, fh.fh_len)) {
// XXX for the open case, what if fh doesn't match the vnode we think we're opening?
// Solaris Named Attributes may do this due to a bug.... so don't warn for named attributes.
- if (!(np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR))
+ if (!(np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)) {
NP(np, "nfs4_open_rpc: warning: file handle mismatch");
+ }
}
/* directory attributes: if we don't get them, make sure to invalidate */
nfsm_chain_op_check(error, &nmrep, NFS_OP_RESTOREFH);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, dnp, nfsvers, &xid);
- if (error)
+ if (error) {
NATTRINVALIDATE(dnp);
+ }
nfsmout_if(error);
- if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX)
+ if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX) {
nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+ }
if (rflags & NFS_OPEN_RESULT_CONFIRM) {
nfs_node_unlock(dnp);
error = nfs4_open_confirm_rpc(nmp, dnp, fh.fh_data, fh.fh_len, noop, sid, thd, cred, &nvattr, &xid);
nfsmout_if(error);
savedxid = xid;
- if ((lockerror = nfs_node_lock(dnp)))
+ if ((lockerror = nfs_node_lock(dnp))) {
error = lockerror;
+ }
}
nfsmout:
lockerror = ENOENT;
nfs_getattr(dnp, NULL, ctx, NGA_CACHED);
}
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(dnp);
+ }
if (!error && !np && fh.fh_len) {
/* create the vnode with the filehandle and attributes */
xid = savedxid;
error = nfs_nget(NFSTOMP(dnp), dnp, cnp, fh.fh_data, fh.fh_len, &nvattr, &xid, rq.r_auth, NG_MAKEENTRY, &newnp);
- if (!error)
+ if (!error) {
newvp = NFSTOV(newnp);
+ }
}
NVATTR_CLEANUP(&nvattr);
- if (!busyerror)
+ if (!busyerror) {
nfs_node_clear_busy(dnp);
+ }
if ((delegation == NFS_OPEN_DELEGATE_READ) || (delegation == NFS_OPEN_DELEGATE_WRITE)) {
- if (!np)
+ if (!np) {
np = newnp;
+ }
if (!error && np && !recall) {
/* stuff the delegation state in the node */
lck_mtx_lock(&np->n_openlock);
np->n_dace = ace;
if (np->n_dlink.tqe_next == NFSNOLIST) {
lck_mtx_lock(&nmp->nm_lock);
- if (np->n_dlink.tqe_next == NFSNOLIST)
+ if (np->n_dlink.tqe_next == NFSNOLIST) {
TAILQ_INSERT_TAIL(&nmp->nm_delegations, np, n_dlink);
+ }
lck_mtx_unlock(&nmp->nm_lock);
}
lck_mtx_unlock(&np->n_openlock);
np->n_dace = ace;
if (np->n_dlink.tqe_next == NFSNOLIST) {
lck_mtx_lock(&nmp->nm_lock);
- if (np->n_dlink.tqe_next == NFSNOLIST)
+ if (np->n_dlink.tqe_next == NFSNOLIST) {
TAILQ_INSERT_TAIL(&nmp->nm_delegations, np, n_dlink);
+ }
lck_mtx_unlock(&nmp->nm_lock);
}
lck_mtx_unlock(&np->n_openlock);
/* return np's current delegation */
nfs4_delegation_return(np, 0, thd, cred);
}
- if (fh.fh_len) /* return fh's delegation if it wasn't for np */
+ if (fh.fh_len) { /* return fh's delegation if it wasn't for np */
nfs4_delegreturn_rpc(nmp, fh.fh_data, fh.fh_len, &dstateid, 0, thd, cred);
+ }
}
}
if (error) {
error = nfs4_setattr_rpc(newnp, vap, ctx);
}
}
- if (error)
+ if (error) {
vnode_put(newvp);
- else
+ } else {
*vpp = newvp;
+ }
}
nfs_open_owner_clear_busy(noop);
- return (error);
+ return error;
}
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
nfs_node_lock_force(np);
struct nfs_sillyrename *nsp = np->n_sillyrename;
dvp = NFSTOV(nsp->nsr_dnp);
if ((error = vnode_get(dvp))) {
+ dvp = NULLVP;
nfs_node_unlock(np);
goto out;
}
* from the n_parent we have stashed away.
*/
if ((np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) &&
- (((dvp = np->n_parent)) && (error = vnode_get(dvp))))
+ (((dvp = np->n_parent)) && (error = vnode_get(dvp)))) {
dvp = NULL;
- if (!dvp)
+ }
+ if (!dvp) {
dvp = vnode_getparent(NFSTOV(np));
+ }
vname = vnode_getname(NFSTOV(np));
if (!dvp || !vname) {
- if (!error)
+ if (!error) {
error = EIO;
+ }
nfs_node_unlock(np);
goto out;
}
filename = &smallname[0];
namelen = snprintf(filename, sizeof(smallname), "%s", name);
if (namelen >= sizeof(smallname)) {
- MALLOC(filename, char *, namelen+1, M_TEMP, M_WAITOK);
+ MALLOC(filename, char *, namelen + 1, M_TEMP, M_WAITOK);
if (!filename) {
error = ENOMEM;
nfs_node_unlock(np);
goto out;
}
- snprintf(filename, namelen+1, "%s", name);
+ snprintf(filename, namelen + 1, "%s", name);
}
nfs_node_unlock(np);
- if ((error = nfs_open_owner_set_busy(noop, NULL)))
+ if ((error = nfs_open_owner_set_busy(noop, NULL))) {
goto out;
+ }
NVATTR_INIT(&nvattr);
delegation = NFS_OPEN_DELEGATE_NONE;
dstateid = np->n_dstateid;
nfsmout_if(error);
error = nfs_request2(np, nmp->nm_mountp, &nmreq, NFSPROC4_COMPOUND, current_thread(),
- noop->noo_cred, &si, flags|R_NOINTR, &nmrep, &xid, &status);
+ noop->noo_cred, &si, flags | R_NOINTR, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
bmlen = NFS_ATTR_BITMAP_LEN;
nfsm_chain_get_bitmap(error, &nmrep, bitmap, bmlen);
nfsm_chain_get_32(error, &nmrep, delegation);
- if (!error)
+ if (!error) {
switch (delegation) {
case NFS_OPEN_DELEGATE_NONE:
// if (!(np->n_openflags & N_DELEG_RETURN)) /* don't warn if delegation is being returned */
- // printf("nfs: open delegated claim didn't return a delegation %s\n", filename ? filename : "???");
+ // printf("nfs: open delegated claim didn't return a delegation %s\n", filename ? filename : "???");
break;
case NFS_OPEN_DELEGATE_READ:
case NFS_OPEN_DELEGATE_WRITE:
if ((((np->n_openflags & N_DELEG_MASK) == N_DELEG_READ) &&
- (delegation == NFS_OPEN_DELEGATE_WRITE)) ||
+ (delegation == NFS_OPEN_DELEGATE_WRITE)) ||
(((np->n_openflags & N_DELEG_MASK) == N_DELEG_WRITE) &&
- (delegation == NFS_OPEN_DELEGATE_READ)))
+ (delegation == NFS_OPEN_DELEGATE_READ))) {
printf("nfs: open delegated claim returned a different delegation type! have %s got %s %s\n",
- ((np->n_openflags & N_DELEG_MASK) == N_DELEG_WRITE) ? "W" : "R",
- (delegation == NFS_OPEN_DELEGATE_WRITE) ? "W" : "R", filename ? filename : "???");
+ ((np->n_openflags & N_DELEG_MASK) == N_DELEG_WRITE) ? "W" : "R",
+ (delegation == NFS_OPEN_DELEGATE_WRITE) ? "W" : "R", filename ? filename : "???");
+ }
nfsm_chain_get_stateid(error, &nmrep, &dstateid);
nfsm_chain_get_32(error, &nmrep, recall);
- if (delegation == NFS_OPEN_DELEGATE_WRITE) // space (skip) XXX
+ if (delegation == NFS_OPEN_DELEGATE_WRITE) { // space (skip) XXX
nfsm_chain_adv(error, &nmrep, 3 * NFSX_UNSIGNED);
+ }
/* if we have any trouble accepting the ACE, just invalidate it */
ace_type = ace_flags = ace_mask = len = 0;
nfsm_chain_get_32(error, &nmrep, ace_type);
ace.ace_flags |= nfs4_ace_nfsflags_to_vfsflags(ace_flags);
ace.ace_rights = nfs4_ace_nfsmask_to_vfsrights(ace_mask);
if (!error && (len >= slen)) {
- MALLOC(s, char*, len+1, M_TEMP, M_WAITOK);
- if (s)
- slen = len+1;
- else
+ MALLOC(s, char*, len + 1, M_TEMP, M_WAITOK);
+ if (s) {
+ slen = len + 1;
+ } else {
ace.ace_flags = 0;
+ }
}
- if (s)
+ if (s) {
nfsm_chain_get_opaque(error, &nmrep, len, s);
- else
+ } else {
nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
+ }
if (!error && s) {
s[len] = '\0';
- if (nfs4_id2guid(s, &ace.ace_applicable, (ace_flags & NFS_ACE_IDENTIFIER_GROUP)))
+ if (nfs4_id2guid(s, &ace.ace_applicable, (ace_flags & NFS_ACE_IDENTIFIER_GROUP))) {
ace.ace_flags = 0;
+ }
}
- if (error || !s)
+ if (error || !s) {
ace.ace_flags = 0;
- if (s && (s != sbuf))
+ }
+ if (s && (s != sbuf)) {
FREE(s, M_TEMP);
+ }
if (!error) {
/* stuff the latest delegation state in the node */
lck_mtx_lock(&np->n_openlock);
np->n_dace = ace;
if (np->n_dlink.tqe_next == NFSNOLIST) {
lck_mtx_lock(&nmp->nm_lock);
- if (np->n_dlink.tqe_next == NFSNOLIST)
+ if (np->n_dlink.tqe_next == NFSNOLIST) {
TAILQ_INSERT_TAIL(&nmp->nm_delegations, np, n_dlink);
+ }
lck_mtx_unlock(&nmp->nm_lock);
}
lck_mtx_unlock(&np->n_openlock);
error = EBADRPC;
break;
}
+ }
nfsmout_if(error);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
error = nfs4_parsefattr(&nmrep, NULL, &nvattr, &fh, NULL, NULL);
if (!NFS_CMPFH(np, fh.fh_data, fh.fh_len)) {
// XXX what if fh doesn't match the vnode we think we're re-opening?
// Solaris Named Attributes may do this due to a bug.... so don't warn for named attributes.
- if (!(np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR))
+ if (!(np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)) {
printf("nfs4_claim_delegated_open_rpc: warning: file handle mismatch %s\n", filename ? filename : "???");
+ }
}
error = nfs_loadattrcache(np, &nvattr, &xid, 1);
nfsmout_if(error);
- if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX)
+ if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX) {
nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+ }
nfsmout:
NVATTR_CLEANUP(&nvattr);
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfs_open_owner_clear_busy(noop);
if ((delegation == NFS_OPEN_DELEGATE_READ) || (delegation == NFS_OPEN_DELEGATE_WRITE)) {
if (recall) {
}
out:
// if (!error)
- // printf("nfs: open claim delegated (%d, %d) succeeded for %s\n", share_access, share_deny, filename ? filename : "???");
- if (filename && (filename != &smallname[0]))
+ // printf("nfs: open claim delegated (%d, %d) succeeded for %s\n", share_access, share_deny, filename ? filename : "???");
+ if (filename && (filename != &smallname[0])) {
FREE(filename, M_TEMP);
- if (vname)
+ }
+ if (vname) {
vnode_putname(vname);
- if (dvp != NULLVP)
+ }
+ if (dvp != NULLVP) {
vnode_put(dvp);
- return (error);
+ }
+ return error;
}
/*
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if ((error = nfs_open_owner_set_busy(noop, NULL)))
- return (error);
+ if ((error = nfs_open_owner_set_busy(noop, NULL))) {
+ return error;
+ }
NVATTR_INIT(&nvattr);
delegation = NFS_OPEN_DELEGATE_NONE;
// open_claim4
nfsm_chain_add_32(error, &nmreq, NFS_CLAIM_PREVIOUS);
delegation = (np->n_openflags & N_DELEG_READ) ? NFS_OPEN_DELEGATE_READ :
- (np->n_openflags & N_DELEG_WRITE) ? NFS_OPEN_DELEGATE_WRITE :
- NFS_OPEN_DELEGATE_NONE;
+ (np->n_openflags & N_DELEG_WRITE) ? NFS_OPEN_DELEGATE_WRITE :
+ NFS_OPEN_DELEGATE_NONE;
nfsm_chain_add_32(error, &nmreq, delegation);
delegation = NFS_OPEN_DELEGATE_NONE;
numops--;
nfsmout_if(error);
error = nfs_request2(np, nmp->nm_mountp, &nmreq, NFSPROC4_COMPOUND, current_thread(),
- noop->noo_cred, &si, R_RECOVER|R_NOINTR, &nmrep, &xid, &status);
+ noop->noo_cred, &si, R_RECOVER | R_NOINTR, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
bmlen = NFS_ATTR_BITMAP_LEN;
nfsm_chain_get_bitmap(error, &nmrep, bitmap, bmlen);
nfsm_chain_get_32(error, &nmrep, delegation);
- if (!error)
+ if (!error) {
switch (delegation) {
case NFS_OPEN_DELEGATE_NONE:
if (np->n_openflags & N_DELEG_MASK) {
case NFS_OPEN_DELEGATE_WRITE:
nfsm_chain_get_stateid(error, &nmrep, &dstateid);
nfsm_chain_get_32(error, &nmrep, recall);
- if (delegation == NFS_OPEN_DELEGATE_WRITE) // space (skip) XXX
+ if (delegation == NFS_OPEN_DELEGATE_WRITE) { // space (skip) XXX
nfsm_chain_adv(error, &nmrep, 3 * NFSX_UNSIGNED);
+ }
/* if we have any trouble accepting the ACE, just invalidate it */
ace_type = ace_flags = ace_mask = len = 0;
nfsm_chain_get_32(error, &nmrep, ace_type);
ace.ace_flags |= nfs4_ace_nfsflags_to_vfsflags(ace_flags);
ace.ace_rights = nfs4_ace_nfsmask_to_vfsrights(ace_mask);
if (!error && (len >= slen)) {
- MALLOC(s, char*, len+1, M_TEMP, M_WAITOK);
- if (s)
- slen = len+1;
- else
+ MALLOC(s, char*, len + 1, M_TEMP, M_WAITOK);
+ if (s) {
+ slen = len + 1;
+ } else {
ace.ace_flags = 0;
+ }
}
- if (s)
+ if (s) {
nfsm_chain_get_opaque(error, &nmrep, len, s);
- else
+ } else {
nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
+ }
if (!error && s) {
s[len] = '\0';
- if (nfs4_id2guid(s, &ace.ace_applicable, (ace_flags & NFS_ACE_IDENTIFIER_GROUP)))
+ if (nfs4_id2guid(s, &ace.ace_applicable, (ace_flags & NFS_ACE_IDENTIFIER_GROUP))) {
ace.ace_flags = 0;
+ }
}
- if (error || !s)
+ if (error || !s) {
ace.ace_flags = 0;
- if (s && (s != sbuf))
+ }
+ if (s && (s != sbuf)) {
FREE(s, M_TEMP);
+ }
if (!error) {
/* stuff the delegation state in the node */
lck_mtx_lock(&np->n_openlock);
np->n_dace = ace;
if (np->n_dlink.tqe_next == NFSNOLIST) {
lck_mtx_lock(&nmp->nm_lock);
- if (np->n_dlink.tqe_next == NFSNOLIST)
+ if (np->n_dlink.tqe_next == NFSNOLIST) {
TAILQ_INSERT_TAIL(&nmp->nm_delegations, np, n_dlink);
+ }
lck_mtx_unlock(&nmp->nm_lock);
}
lck_mtx_unlock(&np->n_openlock);
error = EBADRPC;
break;
}
+ }
nfsmout_if(error);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
error = nfs4_parsefattr(&nmrep, NULL, &nvattr, &fh, NULL, NULL);
// That should be pretty hard in this case, given that we are doing
// the open reclaim using the file handle (and not a dir/name pair).
// Solaris Named Attributes may do this due to a bug.... so don't warn for named attributes.
- if (!(np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR))
+ if (!(np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)) {
NP(np, "nfs4_open_reclaim_rpc: warning: file handle mismatch");
+ }
}
error = nfs_loadattrcache(np, &nvattr, &xid, 1);
nfsmout_if(error);
- if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX)
+ if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX) {
nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+ }
nfsmout:
// if (!error)
- // NP(np, "nfs: open reclaim (%d, %d) succeeded", share_access, share_deny);
+ // NP(np, "nfs: open reclaim (%d, %d) succeeded", share_access, share_deny);
NVATTR_CLEANUP(&nvattr);
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfs_open_owner_clear_busy(noop);
if ((delegation == NFS_OPEN_DELEGATE_READ) || (delegation == NFS_OPEN_DELEGATE_WRITE)) {
- if (recall)
+ if (recall) {
nfs4_delegation_return_enqueue(np);
+ }
}
- return (error);
+ return error;
}
int
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if ((error = nfs_open_owner_set_busy(noop, NULL)))
- return (error);
+ if ((error = nfs_open_owner_set_busy(noop, NULL))) {
+ return error;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND,
- vfs_context_thread(ctx), vfs_context_ucred(ctx),
- &si, R_NOINTR, &nmrep, &xid, &status);
+ vfs_context_thread(ctx), vfs_context_ucred(ctx),
+ &si, R_NOINTR, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfs_open_owner_clear_busy(noop);
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
int
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if ((error = nfs_open_owner_set_busy(noop, NULL)))
- return (error);
+ if ((error = nfs_open_owner_set_busy(noop, NULL))) {
+ return error;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
nfsm_chain_build_done(error, &nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
- error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, flags|R_NOINTR, &nmrep, &xid, &status);
+ error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, flags | R_NOINTR, &nmrep, &xid, &status);
- if ((lockerror = nfs_node_lock(np)))
+ if ((lockerror = nfs_node_lock(np))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
nfsmout:
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock(np);
+ }
nfs_open_owner_clear_busy(noop);
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
if (!error && nofp->nof_d_rw) {
error = nfs4_claim_delegated_open_rpc(nofp, NFS_OPEN_SHARE_ACCESS_BOTH, NFS_OPEN_SHARE_DENY_NONE, flags);
/* for some errors, we should just try reopening the file */
- if (nfs_mount_state_error_delegation_lost(error))
+ if (nfs_mount_state_error_delegation_lost(error)) {
reopen = error;
+ }
if (!error || reopen) {
lck_mtx_lock(&nofp->nof_lock);
nofp->nof_rw += nofp->nof_d_rw;
if (!error) {
error = nfs4_claim_delegated_open_rpc(nofp, NFS_OPEN_SHARE_ACCESS_WRITE, NFS_OPEN_SHARE_DENY_NONE, flags);
/* for some errors, we should just try reopening the file */
- if (nfs_mount_state_error_delegation_lost(error))
+ if (nfs_mount_state_error_delegation_lost(error)) {
reopen = error;
+ }
}
if (!error || reopen) {
lck_mtx_lock(&nofp->nof_lock);
if (!error) {
error = nfs4_claim_delegated_open_rpc(nofp, NFS_OPEN_SHARE_ACCESS_READ, NFS_OPEN_SHARE_DENY_NONE, flags);
/* for some errors, we should just try reopening the file */
- if (nfs_mount_state_error_delegation_lost(error))
+ if (nfs_mount_state_error_delegation_lost(error)) {
reopen = error;
+ }
}
if (!error || reopen) {
lck_mtx_lock(&nofp->nof_lock);
if (reopen && (nfs_check_for_locks(noop, nofp) == 0)) {
/* just reopen the file on next access */
NP(nofp->nof_np, "nfs4_claim_delegated_state_for_open_file: %d, need reopen, %d",
- reopen, kauth_cred_getuid(nofp->nof_owner->noo_cred));
+ reopen, kauth_cred_getuid(nofp->nof_owner->noo_cred));
lck_mtx_lock(&nofp->nof_lock);
nofp->nof_flags |= NFS_OPEN_FILE_REOPEN;
lck_mtx_unlock(&nofp->nof_lock);
- return (0);
+ return 0;
}
- if (reopen)
+ if (reopen) {
NP(nofp->nof_np, "nfs4_claim_delegated_state_for_open_file: %d, locks prevent reopen, %d",
- reopen, kauth_cred_getuid(nofp->nof_owner->noo_cred));
+ reopen, kauth_cred_getuid(nofp->nof_owner->noo_cred));
+ }
}
if (!error && ((nmp = NFSTONMP(nofp->nof_np)))) {
/* claim delegated locks */
TAILQ_FOREACH(nlop, &nofp->nof_np->n_lock_owners, nlo_link) {
- if (nlop->nlo_open_owner != noop)
+ if (nlop->nlo_open_owner != noop) {
continue;
+ }
TAILQ_FOREACH_SAFE(nflp, &nlop->nlo_locks, nfl_lolink, nextnflp) {
/* skip dead & blocked lock requests (shouldn't be any in the held lock list) */
- if (nflp->nfl_flags & (NFS_FILE_LOCK_DEAD|NFS_FILE_LOCK_BLOCKED))
+ if (nflp->nfl_flags & (NFS_FILE_LOCK_DEAD | NFS_FILE_LOCK_BLOCKED)) {
continue;
+ }
/* skip non-delegated locks */
- if (!(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED))
+ if (!(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED)) {
continue;
+ }
error = nmp->nm_funcs->nf_setlock_rpc(nofp->nof_np, nofp, nflp, 0, flags, current_thread(), noop->noo_cred);
if (error) {
NP(nofp->nof_np, "nfs: delegated lock claim (0x%llx, 0x%llx) failed %d, %d",
- nflp->nfl_start, nflp->nfl_end, error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
+ nflp->nfl_start, nflp->nfl_end, error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
break;
}
// else {
- // NP(nofp->nof_np, "nfs: delegated lock claim (0x%llx, 0x%llx) succeeded, %d",
- // nflp->nfl_start, nflp->nfl_end, kauth_cred_getuid(nofp->nof_owner->noo_cred));
+ // NP(nofp->nof_np, "nfs: delegated lock claim (0x%llx, 0x%llx) succeeded, %d",
+ // nflp->nfl_start, nflp->nfl_end, kauth_cred_getuid(nofp->nof_owner->noo_cred));
// }
}
- if (error)
+ if (error) {
break;
+ }
}
}
- if (!error) /* all state claimed successfully! */
- return (0);
+ if (!error) { /* all state claimed successfully! */
+ return 0;
+ }
/* restart if it looks like a problem more than just losing the delegation */
if (!nfs_mount_state_error_delegation_lost(error) &&
((error == ETIMEDOUT) || nfs_mount_state_error_should_restart(error))) {
NP(nofp->nof_np, "nfs delegated lock claim error %d, %d", error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
- if ((error == ETIMEDOUT) && ((nmp = NFSTONMP(nofp->nof_np))))
+ if ((error == ETIMEDOUT) && ((nmp = NFSTONMP(nofp->nof_np)))) {
nfs_need_reconnect(nmp);
- return (error);
+ }
+ return error;
}
- /* delegated state lost (once held but now not claimable) */
+ /* delegated state lost (once held but now not claimable) */
NP(nofp->nof_np, "nfs delegated state claim error %d, state lost, %d", error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
/*
/* revoke all open file state */
nfs_revoke_open_state_for_node(nofp->nof_np);
- return (error);
+ return error;
}
+#endif /* CONFIG_NFS4*/
/*
* Release all open state for the given node.
/* drop held locks */
TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
/* skip dead & blocked lock requests */
- if (nflp->nfl_flags & (NFS_FILE_LOCK_DEAD|NFS_FILE_LOCK_BLOCKED))
+ if (nflp->nfl_flags & (NFS_FILE_LOCK_DEAD | NFS_FILE_LOCK_BLOCKED)) {
continue;
+ }
/* send an unlock if not a delegated lock */
- if (!force && nmp && !(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED))
+ if (!force && nmp && !(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED)) {
nmp->nm_funcs->nf_unlock_rpc(np, nflp->nfl_owner, F_WRLCK, nflp->nfl_start, nflp->nfl_end, R_RECOVER,
- NULL, nflp->nfl_owner->nlo_open_owner->noo_cred);
+ NULL, nflp->nfl_owner->nlo_open_owner->noo_cred);
+ }
/* kill/remove the lock */
lck_mtx_lock(&np->n_openlock);
nflp->nfl_flags |= NFS_FILE_LOCK_DEAD;
/* drop all opens */
TAILQ_FOREACH(nofp, &np->n_opens, nof_link) {
- if (nofp->nof_flags & NFS_OPEN_FILE_LOST)
+ if (nofp->nof_flags & NFS_OPEN_FILE_LOST) {
continue;
+ }
/* mark open state as lost */
lck_mtx_lock(&nofp->nof_lock);
nofp->nof_flags &= ~NFS_OPEN_FILE_REOPEN;
nofp->nof_flags |= NFS_OPEN_FILE_LOST;
-
+
lck_mtx_unlock(&nofp->nof_lock);
- if (!force && nmp && (nmp->nm_vers >= NFS_VER4))
+#if CONFIG_NFS4
+ if (!force && nmp && (nmp->nm_vers >= NFS_VER4)) {
nfs4_close_rpc(np, nofp, NULL, nofp->nof_owner->noo_cred, R_RECOVER);
+ }
+#endif
}
lck_mtx_unlock(&np->n_openlock);
/* mark node as needing to be revoked */
nfs_node_lock_force(np);
- if (np->n_flag & NREVOKE) /* already revoked? */
- {
+ if (np->n_flag & NREVOKE) { /* already revoked? */
NP(np, "nfs_revoke_open_state_for_node(): already revoked");
nfs_node_unlock(np);
return;
}
}
+#if CONFIG_NFS4
/*
* Claim the delegated open combinations that each of this node's open files hold.
*/
TAILQ_FOREACH(nofp, &np->n_opens, nof_link) {
if (!nofp->nof_d_rw_drw && !nofp->nof_d_w_drw && !nofp->nof_d_r_drw &&
!nofp->nof_d_rw_dw && !nofp->nof_d_w_dw && !nofp->nof_d_r_dw &&
- !nofp->nof_d_rw && !nofp->nof_d_w && !nofp->nof_d_r)
+ !nofp->nof_d_rw && !nofp->nof_d_w && !nofp->nof_d_r) {
continue;
+ }
lck_mtx_unlock(&np->n_openlock);
error = nfs4_claim_delegated_state_for_open_file(nofp, flags);
lck_mtx_lock(&np->n_openlock);
- if (error)
+ if (error) {
break;
+ }
goto restart;
}
lck_mtx_unlock(&np->n_openlock);
- return (error);
+ return error;
}
/*
struct nfsmount *nmp;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
+ if (nfs_mount_gone(nmp)) {
return;
+ }
lck_mtx_lock(&np->n_openlock);
np->n_openflags |= N_DELEG_RETURN;
lck_mtx_unlock(&np->n_openlock);
lck_mtx_lock(&nmp->nm_lock);
- if (np->n_dreturn.tqe_next == NFSNOLIST)
+ if (np->n_dreturn.tqe_next == NFSNOLIST) {
TAILQ_INSERT_TAIL(&nmp->nm_dreturnq, np, n_dreturn);
+ }
nfs_mount_sock_thread_wake(nmp);
lck_mtx_unlock(&nmp->nm_lock);
}
int error;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
/* first, make sure the node's marked for delegation return */
lck_mtx_lock(&np->n_openlock);
- np->n_openflags |= (N_DELEG_RETURN|N_DELEG_RETURNING);
+ np->n_openflags |= (N_DELEG_RETURN | N_DELEG_RETURNING);
lck_mtx_unlock(&np->n_openlock);
/* make sure nobody else is using the delegation state */
- if ((error = nfs_open_state_set_busy(np, NULL)))
+ if ((error = nfs_open_state_set_busy(np, NULL))) {
goto out;
+ }
/* claim any delegated state */
- if ((error = nfs4_claim_delegated_state_for_node(np, flags)))
+ if ((error = nfs4_claim_delegated_state_for_node(np, flags))) {
goto out;
+ }
/* return the delegation */
lck_mtx_lock(&np->n_openlock);
}
lck_mtx_unlock(&nmp->nm_lock);
lck_mtx_lock(&np->n_openlock);
- np->n_openflags &= ~(N_DELEG_RETURN|N_DELEG_RETURNING);
+ np->n_openflags &= ~(N_DELEG_RETURN | N_DELEG_RETURNING);
lck_mtx_unlock(&np->n_openlock);
if (error) {
NP(np, "nfs4_delegation_return, error %d", error);
- if (error == ETIMEDOUT)
+ if (error == ETIMEDOUT) {
nfs_need_reconnect(nmp);
+ }
if (nfs_mount_state_error_should_restart(error)) {
/* make sure recovery happens */
lck_mtx_lock(&nmp->nm_lock);
nfs_open_state_clear_busy(np);
- return (error);
+ return error;
}
/*
nfsmout:
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
-
+#endif /* CONFIG_NFS4 */
/*
* NFS read call.
int
nfs_vnop_read(
struct vnop_read_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- struct uio *a_uio;
- int a_ioflag;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * struct uio *a_uio;
+ * int a_ioflag;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vnode_t vp = ap->a_vp;
vfs_context_t ctx = ap->a_context;
struct nfs_open_file *nofp;
int error;
- if (vnode_vtype(ap->a_vp) != VREG)
+ if (vnode_vtype(ap->a_vp) != VREG) {
return (vnode_vtype(vp) == VDIR) ? EISDIR : EPERM;
+ }
np = VTONFS(vp);
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
- if (np->n_flag & NREVOKE)
- return (EIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
+ if (np->n_flag & NREVOKE) {
+ return EIO;
+ }
noop = nfs_open_owner_find(nmp, vfs_context_ucred(ctx), 1);
- if (!noop)
- return (ENOMEM);
+ if (!noop) {
+ return ENOMEM;
+ }
restart:
error = nfs_open_file_find(np, noop, &nofp, 0, 0, 1);
if (!error && (nofp->nof_flags & NFS_OPEN_FILE_LOST)) {
NP(np, "nfs_vnop_read: LOST %d", kauth_cred_getuid(noop->noo_cred));
error = EIO;
}
+#if CONFIG_NFS4
if (!error && (nofp->nof_flags & NFS_OPEN_FILE_REOPEN)) {
error = nfs4_reopen(nofp, vfs_context_thread(ctx));
nofp = NULL;
- if (!error)
+ if (!error) {
goto restart;
+ }
}
+#endif
if (error) {
nfs_open_owner_rele(noop);
- return (error);
+ return error;
}
/*
* Since the read path is a hot path, if we already have
error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
if (error) {
nfs_open_owner_rele(noop);
- return (error);
+ return error;
}
/*
* If we don't have a file already open with the access we need (read) then
if (error) {
nfs_mount_state_in_use_end(nmp, 0);
nfs_open_owner_rele(noop);
- return (error);
+ return error;
}
if (!(nofp->nof_access & NFS_OPEN_SHARE_ACCESS_READ)) {
/* we don't have the file open, so open it for read access if we're not denied */
if (nofp->nof_flags & NFS_OPEN_FILE_NEEDCLOSE) {
NP(np, "nfs_vnop_read: File already needs close access: 0x%x, cred: %d thread: %lld",
- nofp->nof_access, kauth_cred_getuid(nofp->nof_owner->noo_cred), thread_tid(vfs_context_thread(ctx)));
+ nofp->nof_access, kauth_cred_getuid(nofp->nof_owner->noo_cred), thread_tid(vfs_context_thread(ctx)));
}
if (nofp->nof_deny & NFS_OPEN_SHARE_DENY_READ) {
nfs_open_file_clear_busy(nofp);
nfs_mount_state_in_use_end(nmp, 0);
nfs_open_owner_rele(noop);
- return (EPERM);
+ return EPERM;
}
if (np->n_flag & NREVOKE) {
error = EIO;
nfs_open_file_clear_busy(nofp);
nfs_mount_state_in_use_end(nmp, 0);
nfs_open_owner_rele(noop);
- return (error);
+ return error;
}
if (nmp->nm_vers < NFS_VER4) {
/* NFS v2/v3 opens are always allowed - so just add it. */
nfs_open_file_add_open(nofp, NFS_OPEN_SHARE_ACCESS_READ, NFS_OPEN_SHARE_DENY_NONE, 0);
- } else {
+ }
+#if CONFIG_NFS4
+ else {
error = nfs4_open(np, nofp, NFS_OPEN_SHARE_ACCESS_READ, NFS_OPEN_SHARE_DENY_NONE, ctx);
}
- if (!error)
+#endif
+ if (!error) {
nofp->nof_flags |= NFS_OPEN_FILE_NEEDCLOSE;
+ }
}
- if (nofp)
+ if (nofp) {
nfs_open_file_clear_busy(nofp);
+ }
if (nfs_mount_state_in_use_end(nmp, error)) {
nofp = NULL;
goto restart;
}
nfs_open_owner_rele(noop);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
do_read:
- return (nfs_bioread(VTONFS(ap->a_vp), ap->a_uio, ap->a_ioflag, ap->a_context));
+ return nfs_bioread(VTONFS(ap->a_vp), ap->a_uio, ap->a_ioflag, ap->a_context);
}
+#if CONFIG_NFS4
/*
* Note: the NFSv4 CREATE RPC is for everything EXCEPT regular files.
* Files are created using the NFSv4 OPEN RPC. So we must open the
int
nfs4_vnop_create(
struct vnop_create_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_dvp;
- vnode_t *a_vpp;
- struct componentname *a_cnp;
- struct vnode_attr *a_vap;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_dvp;
+ * vnode_t *a_vpp;
+ * struct componentname *a_cnp;
+ * struct vnode_attr *a_vap;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
struct componentname *cnp = ap->a_cnp;
struct nfs_open_file *newnofp = NULL, *nofp = NULL;
nmp = VTONMP(dvp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
- if (vap)
+ if (vap) {
nfs_avoid_needless_id_setting_on_create(VTONFS(dvp), vap, ctx);
+ }
noop = nfs_open_owner_find(nmp, vfs_context_ucred(ctx), 1);
- if (!noop)
- return (ENOMEM);
+ if (!noop) {
+ return ENOMEM;
+ }
restart:
error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
if (error) {
nfs_open_owner_rele(noop);
- return (error);
+ return error;
}
/* grab a provisional, nodeless open file */
error = nfs4_reopen(newnofp, vfs_context_thread(ctx));
nfs_open_file_destroy(newnofp);
newnofp = NULL;
- if (!error)
+ if (!error) {
goto restart;
+ }
}
- if (!error)
+ if (!error) {
error = nfs_open_file_set_busy(newnofp, vfs_context_thread(ctx));
+ }
if (error) {
- if (newnofp)
+ if (newnofp) {
nfs_open_file_destroy(newnofp);
+ }
newnofp = NULL;
goto out;
}
VATTR_INIT(&vattr);
VATTR_SET(&vattr, va_mode, vap->va_mode);
nfs4_setattr_rpc(np, &vattr, ctx);
- if (!error2)
+ if (!error2) {
error = 0;
+ }
}
}
if (error) {
busyerror = nfs_open_file_set_busy(nofp, NULL);
nfs_open_file_add_open(nofp, accessMode, denyMode, 0);
nofp->nof_stateid = newnofp->nof_stateid;
- if (newnofp->nof_flags & NFS_OPEN_FILE_POSIXLOCK)
+ if (newnofp->nof_flags & NFS_OPEN_FILE_POSIXLOCK) {
nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+ }
nfs_open_file_clear_busy(newnofp);
nfs_open_file_destroy(newnofp);
}
nofp->nof_flags |= NFS_OPEN_FILE_CREATE;
nofp->nof_creator = current_thread();
out:
- if (nofp && !busyerror)
+ if (nofp && !busyerror) {
nfs_open_file_clear_busy(nofp);
+ }
if (nfs_mount_state_in_use_end(nmp, error)) {
nofp = newnofp = NULL;
busyerror = 0;
goto restart;
}
- if (noop)
+ if (noop) {
nfs_open_owner_rele(noop);
- return (error);
+ }
+ return error;
}
/*
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(dnp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
namedattrs = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR);
- if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (dnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
sd.specdata1 = sd.specdata2 = 0;
case NFBLK:
case NFCHR:
tag = "mknod";
- if (!VATTR_IS_ACTIVE(vap, va_rdev))
- return (EINVAL);
+ if (!VATTR_IS_ACTIVE(vap, va_rdev)) {
+ return EINVAL;
+ }
sd.specdata1 = major(vap->va_rdev);
sd.specdata2 = minor(vap->va_rdev);
break;
tag = "mkdir";
break;
default:
- return (EINVAL);
+ return EINVAL;
}
nfs_avoid_needless_id_setting_on_create(dnp, vap, ctx);
error = busyerror = nfs_node_set_busy(dnp, vfs_context_thread(ctx));
- if (!namedattrs)
+ if (!namedattrs) {
nfs_dulookup_init(&dul, dnp, cnp->cn_nameptr, cnp->cn_namelen, ctx);
+ }
NFSREQ_SECINFO_SET(&si, dnp, NULL, 0, NULL, 0);
NVATTR_INIT(&nvattr);
nfsmout_if(error);
error = nfs_request_async(dnp, NULL, &nmreq, NFSPROC4_COMPOUND,
- vfs_context_thread(ctx), vfs_context_ucred(ctx), &si, 0, NULL, &req);
+ vfs_context_thread(ctx), vfs_context_ucred(ctx), &si, 0, NULL, &req);
if (!error) {
- if (!namedattrs)
+ if (!namedattrs) {
nfs_dulookup_start(&dul, dnp, ctx);
+ }
error = nfs_request_async_finish(req, &nmrep, &xid, &status);
}
- if ((lockerror = nfs_node_lock(dnp)))
+ if ((lockerror = nfs_node_lock(dnp))) {
error = lockerror;
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
savedxid = xid;
nfsm_chain_loadattr(error, &nmrep, dnp, nfsvers, &xid);
- if (error)
+ if (error) {
NATTRINVALIDATE(dnp);
+ }
nfsmout:
nfsm_chain_cleanup(&nmreq);
/* create the vnode with the filehandle and attributes */
xid = savedxid;
error = nfs_nget(NFSTOMP(dnp), dnp, cnp, fh.fh_data, fh.fh_len, &nvattr, &xid, rq.r_auth, NG_MAKEENTRY, &np);
- if (!error)
+ if (!error) {
newvp = NFSTOV(np);
+ }
}
NVATTR_CLEANUP(&nvattr);
- if (!namedattrs)
+ if (!namedattrs) {
nfs_dulookup_finish(&dul, dnp, ctx);
+ }
/*
* Kludge: Map EEXIST => 0 assuming that you have a reply to a retry
error = nfs_lookitup(dnp, cnp->cn_nameptr, cnp->cn_namelen, ctx, &np);
if (!error) {
newvp = NFSTOV(np);
- if (vnode_vtype(newvp) != nfstov_type(type, nfsvers))
+ if (vnode_vtype(newvp) != nfstov_type(type, nfsvers)) {
error = EEXIST;
+ }
}
}
- if (!busyerror)
+ if (!busyerror) {
nfs_node_clear_busy(dnp);
+ }
if (error) {
if (newvp) {
nfs_node_unlock(np);
nfs_node_unlock(np);
*npp = np;
}
- return (error);
+ return error;
}
int
nfs4_vnop_mknod(
struct vnop_mknod_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_dvp;
- vnode_t *a_vpp;
- struct componentname *a_cnp;
- struct vnode_attr *a_vap;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_dvp;
+ * vnode_t *a_vpp;
+ * struct componentname *a_cnp;
+ * struct vnode_attr *a_vap;
+ * vfs_context_t a_context;
+ * } */*ap)
{
nfsnode_t np = NULL;
struct nfsmount *nmp;
int error;
nmp = VTONMP(ap->a_dvp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
- if (!VATTR_IS_ACTIVE(ap->a_vap, va_type))
- return (EINVAL);
+ if (!VATTR_IS_ACTIVE(ap->a_vap, va_type)) {
+ return EINVAL;
+ }
switch (ap->a_vap->va_type) {
case VBLK:
case VCHR:
case VSOCK:
break;
default:
- return (ENOTSUP);
+ return ENOTSUP;
}
error = nfs4_create_rpc(ap->a_context, VTONFS(ap->a_dvp), ap->a_cnp, ap->a_vap,
- vtonfs_type(ap->a_vap->va_type, nmp->nm_vers), NULL, &np);
- if (!error)
+ vtonfs_type(ap->a_vap->va_type, nmp->nm_vers), NULL, &np);
+ if (!error) {
*ap->a_vpp = NFSTOV(np);
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_mkdir(
struct vnop_mkdir_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_dvp;
- vnode_t *a_vpp;
- struct componentname *a_cnp;
- struct vnode_attr *a_vap;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_dvp;
+ * vnode_t *a_vpp;
+ * struct componentname *a_cnp;
+ * struct vnode_attr *a_vap;
+ * vfs_context_t a_context;
+ * } */*ap)
{
nfsnode_t np = NULL;
int error;
error = nfs4_create_rpc(ap->a_context, VTONFS(ap->a_dvp), ap->a_cnp, ap->a_vap,
- NFDIR, NULL, &np);
- if (!error)
+ NFDIR, NULL, &np);
+ if (!error) {
*ap->a_vpp = NFSTOV(np);
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_symlink(
struct vnop_symlink_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_dvp;
- vnode_t *a_vpp;
- struct componentname *a_cnp;
- struct vnode_attr *a_vap;
- char *a_target;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_dvp;
+ * vnode_t *a_vpp;
+ * struct componentname *a_cnp;
+ * struct vnode_attr *a_vap;
+ * char *a_target;
+ * vfs_context_t a_context;
+ * } */*ap)
{
nfsnode_t np = NULL;
int error;
error = nfs4_create_rpc(ap->a_context, VTONFS(ap->a_dvp), ap->a_cnp, ap->a_vap,
- NFLNK, ap->a_target, &np);
- if (!error)
+ NFLNK, ap->a_target, &np);
+ if (!error) {
*ap->a_vpp = NFSTOV(np);
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_link(
struct vnop_link_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- vnode_t a_tdvp;
- struct componentname *a_cnp;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * vnode_t a_tdvp;
+ * struct componentname *a_cnp;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
vnode_t vp = ap->a_vp;
struct nfsm_chain nmreq, nmrep;
struct nfsreq_secinfo_args si;
- if (vnode_mount(vp) != vnode_mount(tdvp))
- return (EXDEV);
+ if (vnode_mount(vp) != vnode_mount(tdvp)) {
+ return EXDEV;
+ }
nmp = VTONMP(vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
nfsvers = nmp->nm_vers;
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
- if (tdnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (EINVAL);
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
+ if (tdnp->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return EINVAL;
+ }
/*
* Push all writes to the server, so that the attribute cache
*/
nfs_flush(np, MNT_WAIT, vfs_context_thread(ctx), V_IGNORE_WRITEERR);
- if ((error = nfs_node_set_busy2(tdnp, np, vfs_context_thread(ctx))))
- return (error);
+ if ((error = nfs_node_set_busy2(tdnp, np, vfs_context_thread(ctx)))) {
+ return error;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
nfsm_chain_null(&nmreq);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
savedxid = xid;
nfsm_chain_loadattr(error, &nmrep, tdnp, nfsvers, &xid);
- if (error)
+ if (error) {
NATTRINVALIDATE(tdnp);
+ }
/* link attributes: if we don't get them, make sure to invalidate */
nfsm_chain_op_check(error, &nmrep, NFS_OP_RESTOREFH);
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
xid = savedxid;
nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
- if (error)
+ if (error) {
NATTRINVALIDATE(np);
+ }
nfsmout:
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- if (!lockerror)
+ if (!lockerror) {
tdnp->n_flag |= NMODIFIED;
+ }
/* Kludge: Map EEXIST => 0 assuming that it is a reply to a retry. */
- if (error == EEXIST)
+ if (error == EEXIST) {
error = 0;
+ }
if (!error && (tdnp->n_flag & NNEGNCENTRIES)) {
tdnp->n_flag &= ~NNEGNCENTRIES;
cache_purge_negatives(tdvp);
}
- if (!lockerror)
+ if (!lockerror) {
nfs_node_unlock2(tdnp, np);
+ }
nfs_node_clear_busy2(tdnp, np);
- return (error);
+ return error;
}
int
nfs4_vnop_rmdir(
struct vnop_rmdir_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_dvp;
- vnode_t a_vp;
- struct componentname *a_cnp;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_dvp;
+ * vnode_t a_vp;
+ * struct componentname *a_cnp;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
vnode_t vp = ap->a_vp;
nfsnode_t dnp = VTONFS(dvp);
struct nfs_dulookup dul;
- if (vnode_vtype(vp) != VDIR)
- return (EINVAL);
+ if (vnode_vtype(vp) != VDIR) {
+ return EINVAL;
+ }
nmp = NFSTONMP(dnp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
namedattrs = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR);
- if ((error = nfs_node_set_busy2(dnp, np, vfs_context_thread(ctx))))
- return (error);
+ if ((error = nfs_node_set_busy2(dnp, np, vfs_context_thread(ctx)))) {
+ return error;
+ }
if (!namedattrs) {
nfs_dulookup_init(&dul, dnp, cnp->cn_nameptr, cnp->cn_namelen, ctx);
}
error = nfs4_remove_rpc(dnp, cnp->cn_nameptr, cnp->cn_namelen,
- vfs_context_thread(ctx), vfs_context_ucred(ctx));
+ vfs_context_thread(ctx), vfs_context_ucred(ctx));
nfs_name_cache_purge(dnp, np, cnp, ctx);
/* nfs_getattr() will check changed and purge caches */
nfs_getattr(dnp, NULL, ctx, NGA_CACHED);
- if (!namedattrs)
+ if (!namedattrs) {
nfs_dulookup_finish(&dul, dnp, ctx);
+ }
nfs_node_clear_busy2(dnp, np);
/*
* Kludge: Map ENOENT => 0 assuming that you have a reply to a retry.
*/
- if (error == ENOENT)
+ if (error == ENOENT) {
error = 0;
+ }
if (!error) {
/*
* remove nfsnode from hash now so we can't accidentally find it
}
lck_mtx_unlock(nfs_node_hash_mutex);
}
- return (error);
+ return error;
}
/*
struct nfsreq_secinfo_args si;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (NULL);
- if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL)
- return (NULL);
+ if (nfs_mount_gone(nmp)) {
+ return NULL;
+ }
+ if (np->n_vattr.nva_flags & NFS_FFLAG_TRIGGER_REFERRAL) {
+ return NULL;
+ }
NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
NVATTR_INIT(&nvattr);
if (np->n_attrdirfh) {
// XXX can't set parent correctly (to np) yet
- error = nfs_nget(nmp->nm_mountp, NULL, &cn, np->n_attrdirfh+1, *np->n_attrdirfh,
- NULL, NULL, RPCAUTH_UNKNOWN, NG_NOCREATE, &adnp);
- if (adnp)
+ error = nfs_nget(nmp->nm_mountp, NULL, &cn, np->n_attrdirfh + 1, *np->n_attrdirfh,
+ NULL, NULL, RPCAUTH_UNKNOWN, NG_NOCREATE, &adnp);
+ if (adnp) {
goto nfsmout;
+ }
}
if (!fetch) {
error = ENOENT;
NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
NFS_BITMAP_SET(bitmap, NFS_FATTR_FILEHANDLE);
nfsm_chain_add_bitmap_masked(error, &nmreq, bitmap,
- NFS_ATTR_BITMAP_LEN, nmp->nm_fsattr.nfsa_supp_attr);
+ NFS_ATTR_BITMAP_LEN, nmp->nm_fsattr.nfsa_supp_attr);
nfsm_chain_build_done(error, &nmreq);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
error = nfs_request_async(np, NULL, &nmreq, NFSPROC4_COMPOUND,
- vfs_context_thread(ctx), vfs_context_ucred(ctx), &si, 0, NULL, &req);
- if (!error)
+ vfs_context_thread(ctx), vfs_context_ucred(ctx), &si, 0, NULL, &req);
+ if (!error) {
error = nfs_request_async_finish(req, &nmrep, &xid, &status);
+ }
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
}
if (!np->n_attrdirfh || (*np->n_attrdirfh != fh.fh_len)) {
/* (re)allocate attrdir fh buffer */
- if (np->n_attrdirfh)
+ if (np->n_attrdirfh) {
FREE(np->n_attrdirfh, M_TEMP);
- MALLOC(np->n_attrdirfh, u_char*, fh.fh_len+1, M_TEMP, M_WAITOK);
+ }
+ MALLOC(np->n_attrdirfh, u_char*, fh.fh_len + 1, M_TEMP, M_WAITOK);
}
if (!np->n_attrdirfh) {
error = ENOMEM;
}
/* cache the attrdir fh in the node */
*np->n_attrdirfh = fh.fh_len;
- bcopy(fh.fh_data, np->n_attrdirfh+1, fh.fh_len);
+ bcopy(fh.fh_data, np->n_attrdirfh + 1, fh.fh_len);
/* create node for attrdir */
// XXX can't set parent correctly (to np) yet
error = nfs_nget(NFSTOMP(np), NULL, &cn, fh.fh_data, fh.fh_len, &nvattr, &xid, rq.r_auth, 0, &adnp);
if (adnp) {
/* sanity check that this node is an attribute directory */
- if (adnp->n_vattr.nva_type != VDIR)
+ if (adnp->n_vattr.nva_type != VDIR) {
error = EINVAL;
- if (!(adnp->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR))
+ }
+ if (!(adnp->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)) {
error = EINVAL;
+ }
nfs_node_unlock(adnp);
- if (error)
+ if (error) {
vnode_put(NFSTOV(adnp));
+ }
}
- return (error ? NULL : adnp);
+ return error ? NULL : adnp;
}
/*
* the lookup/open, we lock both the node and the attribute directory node.
*/
-#define NFS_GET_NAMED_ATTR_CREATE 0x1
-#define NFS_GET_NAMED_ATTR_CREATE_GUARDED 0x2
-#define NFS_GET_NAMED_ATTR_TRUNCATE 0x4
-#define NFS_GET_NAMED_ATTR_PREFETCH 0x8
+#define NFS_GET_NAMED_ATTR_CREATE 0x1
+#define NFS_GET_NAMED_ATTR_CREATE_GUARDED 0x2
+#define NFS_GET_NAMED_ATTR_TRUNCATE 0x4
+#define NFS_GET_NAMED_ATTR_PREFETCH 0x8
int
nfs4_named_attr_get(
slen = sizeof(sbuf);
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
NVATTR_INIT(&nvattr);
negnamecache = !NMFLAG(nmp, NONEGNAMECACHE);
thd = vfs_context_thread(ctx);
if (!create) {
error = nfs_getattr(np, &nvattr, ctx, NGA_CACHED);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
if (NFS_BITMAP_ISSET(nvattr.nva_bitmap, NFS_FATTR_NAMED_ATTR) &&
- !(nvattr.nva_flags & NFS_FFLAG_HAS_NAMED_ATTRS))
- return (ENOATTR);
+ !(nvattr.nva_flags & NFS_FFLAG_HAS_NAMED_ATTRS)) {
+ return ENOATTR;
+ }
} else if (accessMode == NFS_OPEN_SHARE_ACCESS_NONE) {
/* shouldn't happen... but just be safe */
printf("nfs4_named_attr_get: create with no access %s\n", cnp->cn_nameptr);
* and set NFS_OPEN_FILE_CREATE.
*/
denyMode = NFS_OPEN_SHARE_DENY_NONE;
- if (prefetch && guarded)
+ if (prefetch && guarded) {
prefetch = 0; /* no sense prefetching data that can't be there */
-
+ }
noop = nfs_open_owner_find(nmp, vfs_context_ucred(ctx), 1);
- if (!noop)
- return (ENOMEM);
+ if (!noop) {
+ return ENOMEM;
+ }
}
- if ((error = busyerror = nfs_node_set_busy(np, vfs_context_thread(ctx))))
- return (error);
+ if ((error = busyerror = nfs_node_set_busy(np, vfs_context_thread(ctx)))) {
+ return error;
+ }
adnp = nfs4_named_attr_dir_get(np, 0, ctx);
hadattrdir = (adnp != NULL);
nfsm_chain_null(&nmrep);
if (hadattrdir) {
- if ((error = adbusyerror = nfs_node_set_busy(adnp, vfs_context_thread(ctx))))
+ if ((error = adbusyerror = nfs_node_set_busy(adnp, vfs_context_thread(ctx)))) {
goto nfsmout;
+ }
/* nfs_getattr() will check changed and purge caches */
error = nfs_getattr(adnp, NULL, ctx, NGA_CACHED);
nfsmout_if(error);
*anpp = anp;
error = -1;
}
- if (error != -1) /* cache miss */
+ if (error != -1) { /* cache miss */
break;
- /* FALLTHROUGH */
+ }
+ /* FALLTHROUGH */
case -1:
/* cache hit, not really an error */
OSAddAtomic64(1, &nfsstats.lookupcache_hits);
- if (!anp && avp)
+ if (!anp && avp) {
*anpp = anp = VTONFS(avp);
+ }
nfs_node_clear_busy(adnp);
adbusyerror = ENOENT;
/* compute actual success/failure based on accessibility */
error = nfs_vnop_access(&naa);
- /* FALLTHROUGH */
+ /* FALLTHROUGH */
default:
/* we either found it, or hit an error */
if (!error && guarded) {
*anpp = anp = NULL;
}
/* we're done if error or we don't need to open */
- if (error || !open)
+ if (error || !open) {
goto nfsmout;
+ }
/* no error and we need to open... */
}
}
error = nfs4_reopen(newnofp, vfs_context_thread(ctx));
nfs_open_file_destroy(newnofp);
newnofp = NULL;
- if (!error)
+ if (!error) {
goto restart;
+ }
}
- if (!error)
+ if (!error) {
error = nfs_open_file_set_busy(newnofp, vfs_context_thread(ctx));
+ }
if (error) {
- if (newnofp)
+ if (newnofp) {
nfs_open_file_destroy(newnofp);
+ }
newnofp = NULL;
goto nfsmout;
}
nofp = newnofp;
nofpbusyerror = 0;
newnofp = NULL;
- if (nofpp)
+ if (nofpp) {
*nofpp = nofp;
+ }
}
goto nfsmout;
}
if (open) {
/* need to mark the open owner busy during the RPC */
- if ((error = nfs_open_owner_set_busy(noop, thd)))
+ if ((error = nfs_open_owner_set_busy(noop, thd))) {
goto nfsmout;
+ }
noopbusy = 1;
}
* At a minimum we're sending: PUTFH, LOOKUP/OPEN, GETATTR, PUTFH, GETATTR
*/
numops = 5;
- if (!hadattrdir)
- numops += 3; // also sending: OPENATTR, GETATTR, OPENATTR
- if (prefetch)
- numops += 4; // also sending: SAVEFH, RESTOREFH, NVERIFY, READ
+ if (!hadattrdir) {
+ numops += 3; // also sending: OPENATTR, GETATTR, OPENATTR
+ }
+ if (prefetch) {
+ numops += 4; // also sending: SAVEFH, RESTOREFH, NVERIFY, READ
+ }
nfsm_chain_build_alloc_init(error, &nmreq, 64 * NFSX_UNSIGNED + cnp->cn_namelen);
nfsm_chain_add_compound_header(error, &nmreq, "getnamedattr", nmp->nm_minor_vers, numops);
if (hadattrdir) {
NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
NFS_BITMAP_SET(bitmap, NFS_FATTR_FILEHANDLE);
nfsm_chain_add_bitmap_masked(error, &nmreq, bitmap,
- NFS_ATTR_BITMAP_LEN, nmp->nm_fsattr.nfsa_supp_attr);
+ NFS_ATTR_BITMAP_LEN, nmp->nm_fsattr.nfsa_supp_attr);
}
if (open) {
numops--;
if (create) {
nfsm_chain_add_32(error, &nmreq, guarded);
VATTR_INIT(&vattr);
- if (truncate)
+ if (truncate) {
VATTR_SET(&vattr, va_data_size, 0);
+ }
nfsm_chain_add_fattr4(error, &nmreq, &vattr, nmp);
}
nfsm_chain_add_32(error, &nmreq, NFS_CLAIM_NULL);
NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
NFS_BITMAP_SET(bitmap, NFS_FATTR_FILEHANDLE);
nfsm_chain_add_bitmap_masked(error, &nmreq, bitmap,
- NFS_ATTR_BITMAP_LEN, nmp->nm_fsattr.nfsa_supp_attr);
+ NFS_ATTR_BITMAP_LEN, nmp->nm_fsattr.nfsa_supp_attr);
if (prefetch) {
numops--;
nfsm_chain_add_32(error, &nmreq, NFS_OP_SAVEFH);
numops--;
nfsm_chain_add_32(error, &nmreq, NFS_OP_GETATTR);
nfsm_chain_add_bitmap_masked(error, &nmreq, nfs_getattr_bitmap,
- NFS_ATTR_BITMAP_LEN, nmp->nm_fsattr.nfsa_supp_attr);
+ NFS_ATTR_BITMAP_LEN, nmp->nm_fsattr.nfsa_supp_attr);
if (prefetch) {
numops--;
nfsm_chain_add_32(error, &nmreq, NFS_OP_RESTOREFH);
nfsm_assert(error, (numops == 0), EPROTO);
nfsmout_if(error);
error = nfs_request_async(hadattrdir ? adnp : np, NULL, &nmreq, NFSPROC4_COMPOUND,
- vfs_context_thread(ctx), vfs_context_ucred(ctx), &si, open ? R_NOINTR: 0, NULL, &req);
- if (!error)
+ vfs_context_thread(ctx), vfs_context_ucred(ctx), &si, open ? R_NOINTR: 0, NULL, &req);
+ if (!error) {
error = nfs_request_async_finish(req, &nmrep, &xid, &status);
+ }
- if (hadattrdir && ((adlockerror = nfs_node_lock(adnp))))
+ if (hadattrdir && ((adlockerror = nfs_node_lock(adnp)))) {
error = adlockerror;
+ }
savedxid = xid;
nfsm_chain_skip_tag(error, &nmrep);
nfsm_chain_get_32(error, &nmrep, numops);
if (NFS_BITMAP_ISSET(nvattr.nva_bitmap, NFS_FATTR_FILEHANDLE) && fh.fh_len) {
if (!np->n_attrdirfh || (*np->n_attrdirfh != fh.fh_len)) {
/* (re)allocate attrdir fh buffer */
- if (np->n_attrdirfh)
+ if (np->n_attrdirfh) {
FREE(np->n_attrdirfh, M_TEMP);
- MALLOC(np->n_attrdirfh, u_char*, fh.fh_len+1, M_TEMP, M_WAITOK);
+ }
+ MALLOC(np->n_attrdirfh, u_char*, fh.fh_len + 1, M_TEMP, M_WAITOK);
}
if (np->n_attrdirfh) {
/* remember the attrdir fh in the node */
*np->n_attrdirfh = fh.fh_len;
- bcopy(fh.fh_data, np->n_attrdirfh+1, fh.fh_len);
+ bcopy(fh.fh_data, np->n_attrdirfh + 1, fh.fh_len);
/* create busied node for attrdir */
struct componentname cn;
bzero(&cn, sizeof(cn));
bmlen = NFS_ATTR_BITMAP_LEN;
nfsm_chain_get_bitmap(error, &nmrep, bitmap, bmlen);
nfsm_chain_get_32(error, &nmrep, delegation);
- if (!error)
+ if (!error) {
switch (delegation) {
case NFS_OPEN_DELEGATE_NONE:
break;
case NFS_OPEN_DELEGATE_WRITE:
nfsm_chain_get_stateid(error, &nmrep, &dstateid);
nfsm_chain_get_32(error, &nmrep, recall);
- if (delegation == NFS_OPEN_DELEGATE_WRITE) // space (skip) XXX
+ if (delegation == NFS_OPEN_DELEGATE_WRITE) { // space (skip) XXX
nfsm_chain_adv(error, &nmrep, 3 * NFSX_UNSIGNED);
+ }
/* if we have any trouble accepting the ACE, just invalidate it */
ace_type = ace_flags = ace_mask = len = 0;
nfsm_chain_get_32(error, &nmrep, ace_type);
ace.ace_flags |= nfs4_ace_nfsflags_to_vfsflags(ace_flags);
ace.ace_rights = nfs4_ace_nfsmask_to_vfsrights(ace_mask);
if (!error && (len >= slen)) {
- MALLOC(s, char*, len+1, M_TEMP, M_WAITOK);
- if (s)
- slen = len+1;
- else
+ MALLOC(s, char*, len + 1, M_TEMP, M_WAITOK);
+ if (s) {
+ slen = len + 1;
+ } else {
ace.ace_flags = 0;
+ }
}
- if (s)
+ if (s) {
nfsm_chain_get_opaque(error, &nmrep, len, s);
- else
+ } else {
nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
+ }
if (!error && s) {
s[len] = '\0';
- if (nfs4_id2guid(s, &ace.ace_applicable, (ace_flags & NFS_ACE_IDENTIFIER_GROUP)))
+ if (nfs4_id2guid(s, &ace.ace_applicable, (ace_flags & NFS_ACE_IDENTIFIER_GROUP))) {
ace.ace_flags = 0;
+ }
}
- if (error || !s)
+ if (error || !s) {
ace.ace_flags = 0;
- if (s && (s != sbuf))
+ }
+ if (s && (s != sbuf)) {
FREE(s, M_TEMP);
+ }
break;
default:
error = EBADRPC;
break;
}
+ }
/* At this point if we have no error, the object was created/opened. */
open_error = error;
} else {
error = EIO;
goto nfsmout;
}
- if (prefetch)
+ if (prefetch) {
nfsm_chain_op_check(error, &nmrep, NFS_OP_SAVEFH);
+ }
nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
- if (!hadattrdir)
+ if (!hadattrdir) {
nfsm_chain_op_check(error, &nmrep, NFS_OP_OPENATTR);
+ }
nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
nfsmout_if(error);
xid = savedxid;
nfsmout_if(error);
if (open) {
- if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX)
+ if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX) {
newnofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+ }
if (rflags & NFS_OPEN_RESULT_CONFIRM) {
if (adnp) {
nfs_node_unlock(adnp);
error = nfs4_open_confirm_rpc(nmp, adnp ? adnp : np, fh.fh_data, fh.fh_len, noop, &newnofp->nof_stateid, thd, cred, &nvattr, &xid);
nfsmout_if(error);
savedxid = xid;
- if ((adlockerror = nfs_node_lock(adnp)))
+ if ((adlockerror = nfs_node_lock(adnp))) {
error = adlockerror;
+ }
}
}
nofpbusyerror = nfs_open_file_set_busy(nofp, NULL);
nfs_open_file_add_open(nofp, accessMode, denyMode, 0);
nofp->nof_stateid = newnofp->nof_stateid;
- if (newnofp->nof_flags & NFS_OPEN_FILE_POSIXLOCK)
+ if (newnofp->nof_flags & NFS_OPEN_FILE_POSIXLOCK) {
nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+ }
nfs_open_file_clear_busy(newnofp);
nfs_open_file_destroy(newnofp);
newnofp = NULL;
/* mark the node as holding a create-initiated open */
nofp->nof_flags |= NFS_OPEN_FILE_CREATE;
nofp->nof_creator = current_thread();
- if (nofpp)
+ if (nofpp) {
*nofpp = nofp;
+ }
}
}
}
anp->n_dace = ace;
if (anp->n_dlink.tqe_next == NFSNOLIST) {
lck_mtx_lock(&nmp->nm_lock);
- if (anp->n_dlink.tqe_next == NFSNOLIST)
+ if (anp->n_dlink.tqe_next == NFSNOLIST) {
TAILQ_INSERT_TAIL(&nmp->nm_delegations, anp, n_dlink);
+ }
lck_mtx_unlock(&nmp->nm_lock);
}
lck_mtx_unlock(&anp->n_openlock);
anp->n_dace = ace;
if (anp->n_dlink.tqe_next == NFSNOLIST) {
lck_mtx_lock(&nmp->nm_lock);
- if (anp->n_dlink.tqe_next == NFSNOLIST)
+ if (anp->n_dlink.tqe_next == NFSNOLIST) {
TAILQ_INSERT_TAIL(&nmp->nm_delegations, anp, n_dlink);
+ }
lck_mtx_unlock(&nmp->nm_lock);
}
lck_mtx_unlock(&anp->n_openlock);
/* return anp's current delegation */
nfs4_delegation_return(anp, 0, thd, cred);
}
- if (fh.fh_len) /* return fh's delegation if it wasn't for anp */
+ if (fh.fh_len) { /* return fh's delegation if it wasn't for anp */
nfs4_delegreturn_rpc(nmp, fh.fh_data, fh.fh_len, &dstateid, 0, thd, cred);
+ }
}
}
if (open) {
retlen = MIN(retlen, rlen);
/* check if node needs size update or invalidation */
- if (ISSET(anp->n_flag, NUPDATESIZE))
+ if (ISSET(anp->n_flag, NUPDATESIZE)) {
nfs_data_update_size(anp, 0);
+ }
if (!(error = nfs_node_lock(anp))) {
if (anp->n_flag & NNEEDINVALIDATE) {
anp->n_flag &= ~NNEEDINVALIDATE;
nfs_node_unlock(anp);
- error = nfs_vinvalbuf(NFSTOV(anp), V_SAVE|V_IGNORE_WRITEERR, ctx, 1);
- if (!error) /* lets play it safe and just drop the data */
+ error = nfs_vinvalbuf(NFSTOV(anp), V_SAVE | V_IGNORE_WRITEERR, ctx, 1);
+ if (!error) { /* lets play it safe and just drop the data */
error = EIO;
+ }
} else {
nfs_node_unlock(anp);
}
lastpg = (trunc_page_32(retlen) - 1) / PAGE_SIZE;
pagemask = ((1 << (lastpg + 1)) - 1);
- if (!error)
- error = nfs_buf_get(anp, 0, nmp->nm_biosize, thd, NBLK_READ|NBLK_NOWAIT, &bp);
+ if (!error) {
+ error = nfs_buf_get(anp, 0, nmp->nm_biosize, thd, NBLK_READ | NBLK_NOWAIT, &bp);
+ }
/* don't save the data if dirty or potential I/O conflict */
if (!error && bp && !bp->nb_dirtyoff && !(bp->nb_dirty & pagemask) &&
timevalcmp(&anp->n_lastio, &now, <)) {
OSAddAtomic64(1, &nfsstats.read_bios);
- CLR(bp->nb_flags, (NB_DONE|NB_ASYNC));
+ CLR(bp->nb_flags, (NB_DONE | NB_ASYNC));
SET(bp->nb_flags, NB_READ);
NFS_BUF_MAP(bp);
nfsm_chain_get_opaque(error, &nmrep, retlen, bp->nb_data);
} else {
bp->nb_offio = 0;
bp->nb_endio = rlen;
- if ((retlen > 0) && (bp->nb_endio < (int)retlen))
+ if ((retlen > 0) && (bp->nb_endio < (int)retlen)) {
bp->nb_endio = retlen;
+ }
if (eof || (retlen == 0)) {
/* zero out the remaining data (up to EOF) */
off_t rpcrem, eofrem, rem;
rpcrem = (rlen - retlen);
eofrem = anp->n_size - (NBOFF(bp) + retlen);
rem = (rpcrem < eofrem) ? rpcrem : eofrem;
- if (rem > 0)
+ if (rem > 0) {
bzero(bp->nb_data + retlen, rem);
+ }
} else if ((retlen < rlen) && !ISSET(bp->nb_flags, NB_ERROR)) {
/* ugh... short read ... just invalidate for now... */
SET(bp->nb_flags, NB_INVAL);
nfs_buf_read_finish(bp);
microuptime(&anp->n_lastio);
}
- if (bp)
+ if (bp) {
nfs_buf_release(bp, 1);
+ }
}
error = 0; /* ignore any transient error in processing the prefetch */
}
nfs_node_clear_busy(np);
busyerror = ENOENT;
}
- if (adnp)
+ if (adnp) {
vnode_put(NFSTOV(adnp));
+ }
if (error && *anpp) {
vnode_put(NFSTOV(*anpp));
*anpp = NULL;
}
nfsm_chain_cleanup(&nmreq);
nfsm_chain_cleanup(&nmrep);
- return (error);
+ return error;
}
/*
int error, putanp = 0;
nmp = NFSTONMP(np);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
bzero(&cn, sizeof(cn));
cn.cn_nameptr = __CAST_AWAY_QUALIFIER(name, const, char *);
if (!anp) {
error = nfs4_named_attr_get(np, &cn, NFS_OPEN_SHARE_ACCESS_NONE,
- 0, ctx, &anp, NULL);
- if ((!error && !anp) || (error == ENOATTR))
+ 0, ctx, &anp, NULL);
+ if ((!error && !anp) || (error == ENOATTR)) {
error = ENOENT;
+ }
if (error) {
if (anp) {
vnode_put(NFSTOV(anp));
putanp = 1;
}
- if ((error = nfs_node_set_busy(np, vfs_context_thread(ctx))))
+ if ((error = nfs_node_set_busy(np, vfs_context_thread(ctx)))) {
goto out;
+ }
adnp = nfs4_named_attr_dir_get(np, 1, ctx);
nfs_node_clear_busy(np);
if (!adnp) {
vra.a_context = ctx;
error = nfs_vnop_remove(&vra);
out:
- if (adnp)
+ if (adnp) {
vnode_put(NFSTOV(adnp));
- if (putanp)
+ }
+ if (putanp) {
vnode_put(NFSTOV(anp));
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_getxattr(
struct vnop_getxattr_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- const char * a_name;
- uio_t a_uio;
- size_t *a_size;
- int a_options;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * const char * a_name;
+ * uio_t a_uio;
+ * size_t *a_size;
+ * int a_options;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
struct nfsmount *nmp;
int error = 0, isrsrcfork;
nmp = VTONMP(ap->a_vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
- if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR))
- return (ENOTSUP);
+ if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR)) {
+ return ENOTSUP;
+ }
error = nfs_getattr(VTONFS(ap->a_vp), &nvattr, ctx, NGA_CACHED);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
if (NFS_BITMAP_ISSET(nvattr.nva_bitmap, NFS_FATTR_NAMED_ATTR) &&
- !(nvattr.nva_flags & NFS_FFLAG_HAS_NAMED_ATTRS))
- return (ENOATTR);
+ !(nvattr.nva_flags & NFS_FFLAG_HAS_NAMED_ATTRS)) {
+ return ENOATTR;
+ }
bzero(&cn, sizeof(cn));
cn.cn_nameptr = __CAST_AWAY_QUALIFIER(ap->a_name, const, char *);
isrsrcfork = (bcmp(ap->a_name, XATTR_RESOURCEFORK_NAME, sizeof(XATTR_RESOURCEFORK_NAME)) == 0);
error = nfs4_named_attr_get(VTONFS(ap->a_vp), &cn, NFS_OPEN_SHARE_ACCESS_NONE,
- !isrsrcfork ? NFS_GET_NAMED_ATTR_PREFETCH : 0, ctx, &anp, NULL);
- if ((!error && !anp) || (error == ENOENT))
+ !isrsrcfork ? NFS_GET_NAMED_ATTR_PREFETCH : 0, ctx, &anp, NULL);
+ if ((!error && !anp) || (error == ENOENT)) {
error = ENOATTR;
+ }
if (!error) {
- if (ap->a_uio)
+ if (ap->a_uio) {
error = nfs_bioread(anp, ap->a_uio, 0, ctx);
- else
+ } else {
*ap->a_size = anp->n_size;
+ }
}
- if (anp)
+ if (anp) {
vnode_put(NFSTOV(anp));
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_setxattr(
struct vnop_setxattr_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- const char * a_name;
- uio_t a_uio;
- int a_options;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * const char * a_name;
+ * uio_t a_uio;
+ * int a_options;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
int options = ap->a_options;
uint8_t finfo[FINDERINFOSIZE];
uint32_t *finfop;
struct nfs_open_file *nofp = NULL;
- char uio_buf [ UIO_SIZEOF(1) ];
+ char uio_buf[UIO_SIZEOF(1)];
uio_t auio;
struct vnop_write_args vwa;
nmp = VTONMP(ap->a_vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
- if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR))
- return (ENOTSUP);
+ if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR)) {
+ return ENOTSUP;
+ }
- if ((options & XATTR_CREATE) && (options & XATTR_REPLACE))
- return (EINVAL);
+ if ((options & XATTR_CREATE) && (options & XATTR_REPLACE)) {
+ return EINVAL;
+ }
/* XXX limitation based on need to back up uio on short write */
if (uio_iovcnt(uio) > 1) {
printf("nfs4_vnop_setxattr: iovcnt > 1\n");
- return (EINVAL);
+ return EINVAL;
}
bzero(&cn, sizeof(cn));
isfinderinfo = (bcmp(name, XATTR_FINDERINFO_NAME, sizeof(XATTR_FINDERINFO_NAME)) == 0);
isrsrcfork = isfinderinfo ? 0 : (bcmp(name, XATTR_RESOURCEFORK_NAME, sizeof(XATTR_RESOURCEFORK_NAME)) == 0);
- if (!isrsrcfork)
+ if (!isrsrcfork) {
uio_setoffset(uio, 0);
+ }
if (isfinderinfo) {
- if (uio_resid(uio) != sizeof(finfo))
- return (ERANGE);
+ if (uio_resid(uio) != sizeof(finfo)) {
+ return ERANGE;
+ }
error = uiomove((char*)&finfo, sizeof(finfo), uio);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
/* setting a FinderInfo of all zeroes means remove the FinderInfo */
empty = 1;
- for (i=0, finfop=(uint32_t*)&finfo; i < (int)(sizeof(finfo)/sizeof(uint32_t)); i++)
+ for (i = 0, finfop = (uint32_t*)&finfo; i < (int)(sizeof(finfo) / sizeof(uint32_t)); i++) {
if (finfop[i]) {
empty = 0;
break;
}
- if (empty && !(options & (XATTR_CREATE|XATTR_REPLACE))) {
+ }
+ if (empty && !(options & (XATTR_CREATE | XATTR_REPLACE))) {
error = nfs4_named_attr_remove(VTONFS(ap->a_vp), anp, name, ctx);
- if (error == ENOENT)
+ if (error == ENOENT) {
error = 0;
- return (error);
+ }
+ return error;
}
/* first, let's see if we get a create/replace error */
}
* that by setting the size to 0 on create/open.
*/
flags = 0;
- if (!(options & XATTR_REPLACE))
+ if (!(options & XATTR_REPLACE)) {
flags |= NFS_GET_NAMED_ATTR_CREATE;
- if (options & XATTR_CREATE)
+ }
+ if (options & XATTR_CREATE) {
flags |= NFS_GET_NAMED_ATTR_CREATE_GUARDED;
- if (!isrsrcfork)
+ }
+ if (!isrsrcfork) {
flags |= NFS_GET_NAMED_ATTR_TRUNCATE;
+ }
error = nfs4_named_attr_get(VTONFS(ap->a_vp), &cn, NFS_OPEN_SHARE_ACCESS_BOTH,
- flags, ctx, &anp, &nofp);
- if (!error && !anp)
+ flags, ctx, &anp, &nofp);
+ if (!error && !anp) {
error = ENOATTR;
- if (error)
+ }
+ if (error) {
goto out;
+ }
/* grab the open state from the get/create/open */
if (nofp && !(error = nfs_open_file_set_busy(nofp, NULL))) {
nofp->nof_flags &= ~NFS_OPEN_FILE_CREATE;
}
/* Setting an empty FinderInfo really means remove it, skip to the close/remove */
- if (isfinderinfo && empty)
+ if (isfinderinfo && empty) {
goto doclose;
+ }
/*
* Write the data out and flush.
}
if (vwa.a_uio) {
error = nfs_vnop_write(&vwa);
- if (!error)
+ if (!error) {
error = nfs_flush(anp, MNT_WAIT, vfs_context_thread(ctx), 0);
+ }
}
doclose:
/* Close the xattr. */
if (nofp) {
int busyerror = nfs_open_file_set_busy(nofp, NULL);
closeerror = nfs_close(anp, nofp, NFS_OPEN_SHARE_ACCESS_BOTH, NFS_OPEN_SHARE_DENY_NONE, ctx);
- if (!busyerror)
+ if (!busyerror) {
nfs_open_file_clear_busy(nofp);
+ }
}
- if (!error && isfinderinfo && empty) { /* Setting an empty FinderInfo really means remove it */
+ if (!error && isfinderinfo && empty) { /* Setting an empty FinderInfo really means remove it */
error = nfs4_named_attr_remove(VTONFS(ap->a_vp), anp, name, ctx);
- if (error == ENOENT)
+ if (error == ENOENT) {
error = 0;
+ }
}
- if (!error)
+ if (!error) {
error = closeerror;
+ }
out:
- if (anp)
+ if (anp) {
vnode_put(NFSTOV(anp));
- if (error == ENOENT)
+ }
+ if (error == ENOENT) {
error = ENOATTR;
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_removexattr(
struct vnop_removexattr_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- const char * a_name;
- int a_options;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * const char * a_name;
+ * int a_options;
+ * vfs_context_t a_context;
+ * } */*ap)
{
struct nfsmount *nmp = VTONMP(ap->a_vp);
int error;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
- if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR))
- return (ENOTSUP);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
+ if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR)) {
+ return ENOTSUP;
+ }
error = nfs4_named_attr_remove(VTONFS(ap->a_vp), NULL, ap->a_name, ap->a_context);
- if (error == ENOENT)
+ if (error == ENOENT) {
error = ENOATTR;
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_listxattr(
struct vnop_listxattr_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- uio_t a_uio;
- size_t *a_size;
- int a_options;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * uio_t a_uio;
+ * size_t *a_size;
+ * int a_options;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
nfsnode_t np = VTONFS(ap->a_vp);
struct direntry *dp;
nmp = VTONMP(ap->a_vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
- if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR))
- return (ENOTSUP);
+ if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR)) {
+ return ENOTSUP;
+ }
error = nfs_getattr(np, &nvattr, ctx, NGA_CACHED);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
if (NFS_BITMAP_ISSET(nvattr.nva_bitmap, NFS_FATTR_NAMED_ATTR) &&
- !(nvattr.nva_flags & NFS_FFLAG_HAS_NAMED_ATTRS))
- return (0);
+ !(nvattr.nva_flags & NFS_FFLAG_HAS_NAMED_ATTRS)) {
+ return 0;
+ }
- if ((error = nfs_node_set_busy(np, vfs_context_thread(ctx))))
- return (error);
+ if ((error = nfs_node_set_busy(np, vfs_context_thread(ctx)))) {
+ return error;
+ }
adnp = nfs4_named_attr_dir_get(np, 1, ctx);
nfs_node_clear_busy(np);
- if (!adnp)
+ if (!adnp) {
goto out;
+ }
- if ((error = nfs_node_lock(adnp)))
+ if ((error = nfs_node_lock(adnp))) {
goto out;
+ }
if (adnp->n_flag & NNEEDINVALIDATE) {
adnp->n_flag &= ~NNEEDINVALIDATE;
nfs_invaldir(adnp);
nfs_node_unlock(adnp);
error = nfs_vinvalbuf(NFSTOV(adnp), 0, ctx, 1);
- if (!error)
+ if (!error) {
error = nfs_node_lock(adnp);
- if (error)
+ }
+ if (error) {
goto out;
+ }
}
/*
if (adnp->n_flag & NMODIFIED) {
nfs_invaldir(adnp);
nfs_node_unlock(adnp);
- if ((error = nfs_vinvalbuf(NFSTOV(adnp), 0, ctx, 1)))
+ if ((error = nfs_vinvalbuf(NFSTOV(adnp), 0, ctx, 1))) {
goto out;
+ }
} else {
nfs_node_unlock(adnp);
}
/* nfs_getattr() will check changed and purge caches */
- if ((error = nfs_getattr(adnp, &nvattr, ctx, NGA_UNCACHED)))
+ if ((error = nfs_getattr(adnp, &nvattr, ctx, NGA_UNCACHED))) {
goto out;
+ }
- if (uio && (uio_resid(uio) == 0))
+ if (uio && (uio_resid(uio) == 0)) {
goto out;
+ }
done = 0;
nextcookie = lbn = 0;
cookie = nextcookie;
getbuffer:
error = nfs_buf_get(adnp, lbn, NFS_DIRBLKSIZ, vfs_context_thread(ctx), NBLK_READ, &bp);
- if (error)
+ if (error) {
goto out;
+ }
ndbhp = (struct nfs_dir_buf_header*)bp->nb_data;
if (!ISSET(bp->nb_flags, NB_CACHE) || !ISSET(ndbhp->ndbh_flags, NDB_FULL)) {
if (!ISSET(bp->nb_flags, NB_CACHE)) { /* initialize the buffer */
ndbhp->ndbh_ncgen = adnp->n_ncgen;
}
error = nfs_buf_readdir(bp, ctx);
- if (error == NFSERR_DIRBUFDROPPED)
+ if (error == NFSERR_DIRBUFDROPPED) {
goto getbuffer;
- if (error)
+ }
+ if (error) {
nfs_buf_release(bp, 1);
+ }
if (error && (error != ENXIO) && (error != ETIMEDOUT) && (error != EINTR) && (error != ERESTART)) {
if (!nfs_node_lock(adnp)) {
nfs_invaldir(adnp);
nfs_node_unlock(adnp);
}
nfs_vinvalbuf(NFSTOV(adnp), 0, ctx, 1);
- if (error == NFSERR_BAD_COOKIE)
+ if (error == NFSERR_BAD_COOKIE) {
error = ENOENT;
+ }
}
- if (error)
+ if (error) {
goto out;
+ }
}
/* go through all the entries copying/counting */
dp = NFS_DIR_BUF_FIRST_DIRENTRY(bp);
- for (i=0; i < ndbhp->ndbh_count; i++) {
+ for (i = 0; i < ndbhp->ndbh_count; i++) {
if (!xattr_protected(dp->d_name)) {
if (uio == NULL) {
*ap->a_size += dp->d_namlen + 1;
} else if (uio_resid(uio) < (dp->d_namlen + 1)) {
error = ERANGE;
} else {
- error = uiomove(dp->d_name, dp->d_namlen+1, uio);
- if (error && (error != EFAULT))
+ error = uiomove(dp->d_name, dp->d_namlen + 1, uio);
+ if (error && (error != EFAULT)) {
error = ERANGE;
+ }
}
}
nextcookie = dp->d_seekoff;
/* hit end of buffer, move to next buffer */
lbn = nextcookie;
/* if we also hit EOF, we're done */
- if (ISSET(ndbhp->ndbh_flags, NDB_EOF))
+ if (ISSET(ndbhp->ndbh_flags, NDB_EOF)) {
done = 1;
+ }
}
if (!error && !done && (nextcookie == cookie)) {
printf("nfs readdir cookie didn't change 0x%llx, %d/%d\n", cookie, i, ndbhp->ndbh_count);
nfs_buf_release(bp, 1);
}
out:
- if (adnp)
+ if (adnp) {
vnode_put(NFSTOV(adnp));
- return (error);
+ }
+ return error;
}
#if NAMEDSTREAMS
int
nfs4_vnop_getnamedstream(
struct vnop_getnamedstream_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- vnode_t *a_svpp;
- const char *a_name;
- enum nsoperation a_operation;
- int a_flags;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * vnode_t *a_svpp;
+ * const char *a_name;
+ * enum nsoperation a_operation;
+ * int a_flags;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
struct nfsmount *nmp;
int error = 0;
nmp = VTONMP(ap->a_vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
- if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR))
- return (ENOTSUP);
+ if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR)) {
+ return ENOTSUP;
+ }
error = nfs_getattr(VTONFS(ap->a_vp), &nvattr, ctx, NGA_CACHED);
- if (error)
- return (error);
+ if (error) {
+ return error;
+ }
if (NFS_BITMAP_ISSET(nvattr.nva_bitmap, NFS_FATTR_NAMED_ATTR) &&
- !(nvattr.nva_flags & NFS_FFLAG_HAS_NAMED_ATTRS))
- return (ENOATTR);
+ !(nvattr.nva_flags & NFS_FFLAG_HAS_NAMED_ATTRS)) {
+ return ENOATTR;
+ }
bzero(&cn, sizeof(cn));
cn.cn_nameptr = __CAST_AWAY_QUALIFIER(ap->a_name, const, char *);
cn.cn_flags = MAKEENTRY;
error = nfs4_named_attr_get(VTONFS(ap->a_vp), &cn, NFS_OPEN_SHARE_ACCESS_NONE,
- 0, ctx, &anp, NULL);
- if ((!error && !anp) || (error == ENOENT))
+ 0, ctx, &anp, NULL);
+ if ((!error && !anp) || (error == ENOENT)) {
error = ENOATTR;
- if (!error && anp)
+ }
+ if (!error && anp) {
*ap->a_svpp = NFSTOV(anp);
- else if (anp)
+ } else if (anp) {
vnode_put(NFSTOV(anp));
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_makenamedstream(
struct vnop_makenamedstream_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t *a_svpp;
- vnode_t a_vp;
- const char *a_name;
- int a_flags;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t *a_svpp;
+ * vnode_t a_vp;
+ * const char *a_name;
+ * int a_flags;
+ * vfs_context_t a_context;
+ * } */*ap)
{
vfs_context_t ctx = ap->a_context;
struct nfsmount *nmp;
int error = 0;
nmp = VTONMP(ap->a_vp);
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
- if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR))
- return (ENOTSUP);
+ if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR)) {
+ return ENOTSUP;
+ }
bzero(&cn, sizeof(cn));
cn.cn_nameptr = __CAST_AWAY_QUALIFIER(ap->a_name, const, char *);
cn.cn_flags = MAKEENTRY;
error = nfs4_named_attr_get(VTONFS(ap->a_vp), &cn, NFS_OPEN_SHARE_ACCESS_BOTH,
- NFS_GET_NAMED_ATTR_CREATE, ctx, &anp, NULL);
- if ((!error && !anp) || (error == ENOENT))
+ NFS_GET_NAMED_ATTR_CREATE, ctx, &anp, NULL);
+ if ((!error && !anp) || (error == ENOENT)) {
error = ENOATTR;
- if (!error && anp)
+ }
+ if (!error && anp) {
*ap->a_svpp = NFSTOV(anp);
- else if (anp)
+ } else if (anp) {
vnode_put(NFSTOV(anp));
- return (error);
+ }
+ return error;
}
int
nfs4_vnop_removenamedstream(
struct vnop_removenamedstream_args /* {
- struct vnodeop_desc *a_desc;
- vnode_t a_vp;
- vnode_t a_svp;
- const char *a_name;
- int a_flags;
- vfs_context_t a_context;
- } */ *ap)
+ * struct vnodeop_desc *a_desc;
+ * vnode_t a_vp;
+ * vnode_t a_svp;
+ * const char *a_name;
+ * int a_flags;
+ * vfs_context_t a_context;
+ * } */*ap)
{
struct nfsmount *nmp = VTONMP(ap->a_vp);
nfsnode_t np = ap->a_vp ? VTONFS(ap->a_vp) : NULL;
nfsnode_t anp = ap->a_svp ? VTONFS(ap->a_svp) : NULL;
- if (nfs_mount_gone(nmp))
- return (ENXIO);
+ if (nfs_mount_gone(nmp)) {
+ return ENXIO;
+ }
/*
* Given that a_svp is a named stream, checking for
* named attribute support is kinda pointless.
*/
- if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR))
- return (ENOTSUP);
+ if (!(nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR)) {
+ return ENOTSUP;
+ }
- return (nfs4_named_attr_remove(np, anp, ap->a_name, ap->a_context));
+ return nfs4_named_attr_remove(np, anp, ap->a_name, ap->a_context);
}
#endif
+#endif /* CONFIG_NFS4 */
projects / apple / xnu.git / blobdiff