]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/nfs/nfs4_vnops.c
projects / apple / xnu.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
xnu-6153.81.5.tar.gz
[apple/xnu.git] / bsd / nfs / nfs4_vnops.c
diff --git a/bsd/nfs/nfs4_vnops.c b/bsd/nfs/nfs4_vnops.c
index ca874aa7cd4943e9edf11fe00adab83d879ee1f8..261da73e24f107fcd097a6154d0cde00362b2d31 100644 (file)
--- a/bsd/nfs/nfs4_vnops.c
+++ b/bsd/nfs/nfs4_vnops.c
@@ -1,8 +1,8 @@
 /*
 /*
- * Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @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
  * 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
@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,
  * 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,
@@ -22,7 +22,7 @@
  * 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.
  * 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@
  */
 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
@@ -79,8 +79,9 @@
 #include <kern/task.h>
 #include <kern/sched_prim.h>
 
 #include <kern/task.h>
 #include <kern/sched_prim.h>
 
+#if CONFIG_NFS4
 int
 int
-nfs4_access_rpc(nfsnode_t np, u_int32_t *access, vfs_context_t ctx)
+nfs4_access_rpc(nfsnode_t np, u_int32_t *access, int rpcflags, vfs_context_t ctx)
 {
        int error = 0, lockerror = ENOENT, status, numops, slot;
        u_int64_t xid;
 {
        int error = 0, lockerror = ENOENT, status, numops, slot;
        u_int64_t xid;
@@ -92,8 +93,9 @@ nfs4_access_rpc(nfsnode_t np, u_int32_t *access, vfs_context_t ctx)
        uid_t uid;
        struct nfsreq_secinfo_args si;
 
        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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -102,7 +104,7 @@ nfs4_access_rpc(nfsnode_t np, u_int32_t *access, vfs_context_t ctx)
        // PUTFH, ACCESS, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 17 * NFSX_UNSIGNED);
        // PUTFH, ACCESS, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 17 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "access", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "access", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -115,10 +117,13 @@ nfs4_access_rpc(nfsnode_t np, u_int32_t *access, vfs_context_t ctx)
        nfsm_chain_build_done(error, &nmreq);
        nfsm_assert(error, (numops == 0), EPROTO);
        nfsmout_if(error);
        nfsm_chain_build_done(error, &nmreq);
        nfsm_assert(error, (numops == 0), EPROTO);
        nfsmout_if(error);
-       error = nfs_request(np, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
+       error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND,
+           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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -141,21 +146,33 @@ nfs4_access_rpc(nfsnode_t np, u_int32_t *access, vfs_context_t ctx)
        /* ".zfs" subdirectories may erroneously give a denied answer for modify/delete */
        if (nfs_access_dotzfs) {
                vnode_t dvp = NULLVP;
        /* ".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 */
                        access_result |= NFS_ACCESS_DELETE; /* may be able to delete snapshot dirs */
-               if (dvp != NULLVP)
+               }
+               if (dvp != NULLVP) {
                        vnode_put(dvp);
                        vnode_put(dvp);
+               }
        }
        /* Some servers report DELETE support but erroneously give a denied answer. */
        }
        /* 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;
                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);
 
        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);
        slot = nfs_node_access_slot(np, uid, 1);
        np->n_accessuid[slot] = uid;
        microuptime(&now);
@@ -165,11 +182,12 @@ nfs4_access_rpc(nfsnode_t np, u_int32_t *access, vfs_context_t ctx)
        /* pass back the access returned with this request */
        *access = np->n_access[slot];
 nfsmout:
        /* pass back the access returned with this request */
        *access = np->n_access[slot];
 nfsmout:
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(np);
                nfs_node_unlock(np);
+       }
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 int
 }
 
 int
@@ -189,18 +207,24 @@ nfs4_getattr_rpc(
        struct nfsm_chain nmreq, nmrep;
        struct nfsreq_secinfo_args si;
 
        struct nfsm_chain nmreq, nmrep;
        struct nfsreq_secinfo_args si;
 
-       if (!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);
        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;
                rpcflags = R_RECOVER;
+       }
+
+       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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -209,22 +233,23 @@ nfs4_getattr_rpc(
        // PUTFH, GETATTR
        numops = 2;
        nfsm_chain_build_alloc_init(error, &nmreq, 15 * NFSX_UNSIGNED);
        // PUTFH, GETATTR
        numops = 2;
        nfsm_chain_build_alloc_init(error, &nmreq, 15 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "getattr", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "getattr", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, fhp, fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_GETATTR);
        NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, fhp, fhsize);
        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);
                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);
        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);
 
        nfsm_chain_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
@@ -241,7 +266,7 @@ nfs4_getattr_rpc(
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 int
 }
 
 int
@@ -255,10 +280,12 @@ nfs4_readlink_rpc(nfsnode_t np, char *buf, uint32_t *buflenp, vfs_context_t ctx)
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!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);
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
        nfsm_chain_null(&nmrep);
@@ -266,7 +293,7 @@ nfs4_readlink_rpc(nfsnode_t np, char *buf, uint32_t *buflenp, vfs_context_t ctx)
        // PUTFH, GETATTR, READLINK
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 16 * NFSX_UNSIGNED);
        // PUTFH, GETATTR, READLINK
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 16 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "readlink", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "readlink", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, NFS_VER4, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, NFS_VER4, np->n_fhp, np->n_fhsize);
@@ -280,8 +307,9 @@ nfs4_readlink_rpc(nfsnode_t np, char *buf, uint32_t *buflenp, vfs_context_t ctx)
        nfsmout_if(error);
        error = nfs_request(np, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
 
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -291,20 +319,23 @@ nfs4_readlink_rpc(nfsnode_t np, char *buf, uint32_t *buflenp, vfs_context_t ctx)
        nfsm_chain_get_32(error, &nmrep, len);
        nfsmout_if(error);
        if (len >= *buflenp) {
        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;
                        len = np->n_size;
-               else
+               } else {
                        len = *buflenp - 1;
                        len = *buflenp - 1;
+               }
        }
        nfsm_chain_get_opaque(error, &nmrep, len, buf);
        }
        nfsm_chain_get_opaque(error, &nmrep, len, buf);
-       if (!error)
+       if (!error) {
                *buflenp = len;
                *buflenp = len;
+       }
 nfsmout:
 nfsmout:
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(np);
                nfs_node_unlock(np);
+       }
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 int
 }
 
 int
@@ -324,11 +355,13 @@ nfs4_read_rpc_async(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -336,7 +369,7 @@ nfs4_read_rpc_async(
        // PUTFH, READ, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 22 * NFSX_UNSIGNED);
        // PUTFH, READ, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 22 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "read", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "read", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -355,7 +388,7 @@ nfs4_read_rpc_async(
        error = nfs_request_async(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, 0, cb, reqp);
 nfsmout:
        nfsm_chain_cleanup(&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
 }
 
 int
@@ -373,20 +406,22 @@ nfs4_read_rpc_async_finish(
        struct nfsm_chain nmrep;
 
        nmp = NFSTONMP(np);
        struct nfsm_chain nmrep;
 
        nmp = NFSTONMP(np);
-       if (!nmp) {
+       if (nfs_mount_gone(nmp)) {
                nfs_request_async_cancel(req);
                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);
        }
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -399,17 +434,20 @@ nfs4_read_rpc_async_finish(
        }
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
        }
        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);
                nfs_node_unlock(np);
+       }
        if (eofp) {
        if (eofp) {
-               if (!eof && !retlen)
+               if (!eof && !retlen) {
                        eof = 1;
                        eof = 1;
+               }
                *eofp = eof;
        }
        nfsm_chain_cleanup(&nmrep);
                *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);
                microuptime(&np->n_lastio);
-       return (error);
+       }
+       return error;
 }
 
 int
 }
 
 int
@@ -431,16 +469,19 @@ nfs4_write_rpc_async(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        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 &&
 
        /* 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;
                iomode = NFS_WRITE_UNSTABLE;
+       }
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -448,7 +489,7 @@ nfs4_write_rpc_async(
        // PUTFH, WRITE, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 25 * NFSX_UNSIGNED + len);
        // PUTFH, WRITE, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 25 * NFSX_UNSIGNED + len);
-       nfsm_chain_add_compound_header(error, &nmreq, "write", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "write", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -459,8 +500,9 @@ nfs4_write_rpc_async(
        nfsm_chain_add_64(error, &nmreq, uio_offset(uio));
        nfsm_chain_add_32(error, &nmreq, iomode);
        nfsm_chain_add_32(error, &nmreq, len);
        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);
                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);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_GETATTR);
        nfsm_chain_add_bitmap_supported(error, &nmreq, nfs_getattr_bitmap, nmp, np);
@@ -471,7 +513,7 @@ nfs4_write_rpc_async(
        error = nfs_request_async(np, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, 0, cb, reqp);
 nfsmout:
        nfsm_chain_cleanup(&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
 }
 
 int
@@ -491,22 +533,25 @@ nfs4_write_rpc_async_finish(
        struct nfsm_chain nmrep;
 
        nmp = NFSTONMP(np);
        struct nfsm_chain nmrep;
 
        nmp = NFSTONMP(np);
-       if (!nmp) {
+       if (nfs_mount_gone(nmp)) {
                nfs_request_async_cancel(req);
                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);
        }
        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);
        nmp = NFSTONMP(np);
-       if (!nmp)
+       if (nfs_mount_gone(nmp)) {
                error = ENXIO;
                error = ENXIO;
-       if (!error && (lockerror = nfs_node_lock(np)))
+       }
+       if (!error && (lockerror = nfs_node_lock(np))) {
                error = lockerror;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -514,13 +559,15 @@ nfs4_write_rpc_async_finish(
        nfsm_chain_get_32(error, &nmrep, rlen);
        nfsmout_if(error);
        *rlenp = rlen;
        nfsm_chain_get_32(error, &nmrep, rlen);
        nfsmout_if(error);
        *rlenp = rlen;
-       if (rlen <= 0)
+       if (rlen <= 0) {
                error = NFSERR_IO;
                error = NFSERR_IO;
+       }
        nfsm_chain_get_32(error, &nmrep, committed);
        nfsm_chain_get_64(error, &nmrep, wverf);
        nfsmout_if(error);
        nfsm_chain_get_32(error, &nmrep, committed);
        nfsm_chain_get_64(error, &nmrep, wverf);
        nfsmout_if(error);
-       if (wverfp)
+       if (wverfp) {
                *wverfp = wverf;
                *wverfp = wverf;
+       }
        lck_mtx_lock(&nmp->nm_lock);
        if (!(nmp->nm_state & NFSSTA_HASWRITEVERF)) {
                nmp->nm_verf = wverf;
        lck_mtx_lock(&nmp->nm_lock);
        if (!(nmp->nm_state & NFSSTA_HASWRITEVERF)) {
                nmp->nm_verf = wverf;
@@ -532,16 +579,19 @@ nfs4_write_rpc_async_finish(
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
 nfsmout:
        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_node_unlock(np);
+       }
        nfsm_chain_cleanup(&nmrep);
        if ((committed != NFS_WRITE_FILESYNC) && nfs_allow_async &&
        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;
                committed = NFS_WRITE_FILESYNC;
+       }
        *iomodep = committed;
        *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);
                microuptime(&np->n_lastio);
-       return (error);
+       }
+       return error;
 }
 
 int
 }
 
 int
@@ -560,11 +610,13 @@ nfs4_remove_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(dnp);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(dnp);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        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);
        NFSREQ_SECINFO_SET(&si, dnp, NULL, 0, NULL, 0);
 restart:
        nfsm_chain_null(&nmreq);
@@ -573,7 +625,7 @@ restart:
        // PUTFH, REMOVE, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 17 * NFSX_UNSIGNED + namelen);
        // PUTFH, REMOVE, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 17 * NFSX_UNSIGNED + namelen);
-       nfsm_chain_add_compound_header(error, &nmreq, "remove", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "remove", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
@@ -589,8 +641,9 @@ restart:
 
        error = nfs_request2(dnp, NULL, &nmreq, NFSPROC4_COMPOUND, thd, cred, &si, 0, &nmrep, &xid, &status);
 
 
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -599,8 +652,9 @@ restart:
        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);
        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);
                NATTRINVALIDATE(dnp);
+       }
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
@@ -610,11 +664,11 @@ nfsmout:
                nfs_node_unlock(dnp);
        }
        if (error == NFSERR_GRACE) {
                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;
        }
 
                goto restart;
        }
 
-       return (remove_error);
+       return remove_error;
 }
 
 int
 }
 
 int
@@ -634,13 +688,16 @@ nfs4_rename_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(fdnp);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(fdnp);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        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);
 
        NFSREQ_SECINFO_SET(&si, fdnp, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -649,7 +706,7 @@ nfs4_rename_rpc(
        // PUTFH(FROM), SAVEFH, PUTFH(TO), RENAME, GETATTR(TO), RESTOREFH, GETATTR(FROM)
        numops = 7;
        nfsm_chain_build_alloc_init(error, &nmreq, 30 * NFSX_UNSIGNED + fnamelen + tnamelen);
        // PUTFH(FROM), SAVEFH, PUTFH(TO), RENAME, GETATTR(TO), RESTOREFH, GETATTR(FROM)
        numops = 7;
        nfsm_chain_build_alloc_init(error, &nmreq, 30 * NFSX_UNSIGNED + fnamelen + tnamelen);
-       nfsm_chain_add_compound_header(error, &nmreq, "rename", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "rename", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, fdnp->n_fhp, fdnp->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, fdnp->n_fhp, fdnp->n_fhsize);
@@ -676,8 +733,9 @@ nfs4_rename_rpc(
 
        error = nfs_request(fdnp, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
 
 
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -690,14 +748,16 @@ nfs4_rename_rpc(
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        savedxid = xid;
        nfsm_chain_loadattr(error, &nmrep, tdnp, nfsvers, &xid);
        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);
                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);
        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);
                NATTRINVALIDATE(fdnp);
+       }
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
@@ -706,7 +766,7 @@ nfsmout:
                tdnp->n_flag |= NMODIFIED;
                nfs_node_unlock2(fdnp, tdnp);
        }
                tdnp->n_flag |= NMODIFIED;
                nfs_node_unlock2(fdnp, tdnp);
        }
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -733,16 +793,18 @@ nfs4_readdir_rpc(nfsnode_t dnp, struct nfsbuf *bp, vfs_context_t ctx)
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(dnp);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(dnp);
-       if (!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;
        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);
 
        /*
        NFSREQ_SECINFO_SET(&si, dnp, NULL, 0, NULL, 0);
 
        /*
@@ -764,21 +826,23 @@ nfs4_readdir_rpc(nfsnode_t dnp, struct nfsbuf *bp, vfs_context_t ctx)
        NFS_BITMAP_SET(entry_attrs, NFS_FATTR_RDATTR_ERROR);
 
        /* lock to protect access to cookie verifier */
        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) {
 
        /* 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);
                        dp = NFS_DIRENTRY_NEXT(dp);
+               }
                cookie = dp->d_seekoff;
                dp = NFS_DIRENTRY_NEXT(dp);
        } else {
                cookie = bp->nb_lblkno;
                /* increment with every buffer read */
                cookie = dp->d_seekoff;
                dp = NFS_DIRENTRY_NEXT(dp);
        } else {
                cookie = bp->nb_lblkno;
                /* increment with every buffer read */
-               OSAddAtomic(1, &nfsstats.readdir_bios);
+               OSAddAtomic64(1, &nfsstats.readdir_bios);
        }
        lastcookie = cookie;
 
        }
        lastcookie = cookie;
 
@@ -795,10 +859,11 @@ nfs4_readdir_rpc(nfsnode_t dnp, struct nfsbuf *bp, vfs_context_t ctx)
                /* "." */
                namlen = 1;
                reclen = NFS_DIRENTRY_LEN(namlen + xlen);
                /* "." */
                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;
                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;
                dp->d_fileno = dnp->n_vattr.nva_fileid;
                dp->d_type = DT_DIR;
                dp->d_reclen = reclen;
@@ -806,32 +871,38 @@ nfs4_readdir_rpc(nfsnode_t dnp, struct nfsbuf *bp, vfs_context_t ctx)
                padstart = dp->d_name + dp->d_namlen + 1 + xlen;
                dp = NFS_DIRENTRY_NEXT(dp);
                padlen = (char*)dp - padstart;
                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);
                        bzero(padstart, padlen);
-               if (rdirplus) /* zero out attributes */
+               }
+               if (rdirplus) { /* zero out attributes */
                        bzero(NFS_DIR_BUF_NVATTR(bp, 0), sizeof(struct nfs_vattr));
                        bzero(NFS_DIR_BUF_NVATTR(bp, 0), sizeof(struct nfs_vattr));
+               }
 
                /* ".." */
                namlen = 2;
                reclen = NFS_DIRENTRY_LEN(namlen + xlen);
 
                /* ".." */
                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;
                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;
                        dp->d_fileno = VTONFS(dnp->n_parent)->n_vattr.nva_fileid;
-               else
+               } else {
                        dp->d_fileno = dnp->n_vattr.nva_fileid;
                        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;
                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);
                        bzero(padstart, padlen);
-               if (rdirplus) /* zero out attributes */
+               }
+               if (rdirplus) { /* zero out attributes */
                        bzero(NFS_DIR_BUF_NVATTR(bp, 1), sizeof(struct nfs_vattr));
                        bzero(NFS_DIR_BUF_NVATTR(bp, 1), sizeof(struct nfs_vattr));
+               }
 
                ndbhp->ndbh_entry_end = (char*)dp - bp->nb_data;
                ndbhp->ndbh_count = 2;
 
                ndbhp->ndbh_entry_end = (char*)dp - bp->nb_data;
                ndbhp->ndbh_count = 2;
@@ -845,11 +916,10 @@ nfs4_readdir_rpc(nfsnode_t dnp, struct nfsbuf *bp, vfs_context_t ctx)
        nfsm_chain_null(&nmreq);
        nfsm_chain_null(&nmrep);
        while (nfs_dir_buf_freespace(bp, rdirplus) && !(ndbhp->ndbh_flags & NDB_FULL)) {
        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);
                // PUTFH, GETATTR, READDIR
                numops = 3;
                nfsm_chain_build_alloc_init(error, &nmreq, 26 * NFSX_UNSIGNED);
-               nfsm_chain_add_compound_header(error, &nmreq, tag, numops);
+               nfsm_chain_add_compound_header(error, &nmreq, tag, nmp->nm_minor_vers, numops);
                numops--;
                nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
                nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
                numops--;
                nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
                nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
@@ -869,8 +939,9 @@ nfs4_readdir_rpc(nfsnode_t dnp, struct nfsbuf *bp, vfs_context_t ctx)
                nfsmout_if(error);
                error = nfs_request(dnp, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
 
                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;
                        error = lockerror;
+               }
 
                savedxid = xid;
                nfsm_chain_skip_tag(error, &nmrep);
 
                savedxid = xid;
                nfsm_chain_skip_tag(error, &nmrep);
@@ -888,8 +959,9 @@ nfs4_readdir_rpc(nfsnode_t dnp, struct nfsbuf *bp, vfs_context_t ctx)
                }
                nfsmout_if(error);
 
                }
                nfsmout_if(error);
 
-               if (rdirplus)
+               if (rdirplus) {
                        microuptime(&now);
                        microuptime(&now);
+               }
 
                /* loop through the entries packing them into the buffer */
                while (more_entries) {
 
                /* loop through the entries packing them into the buffer */
                while (more_entries) {
@@ -909,7 +981,7 @@ nfs4_readdir_rpc(nfsnode_t dnp, struct nfsbuf *bp, vfs_context_t ctx)
                                error = EBADRPC;
                                goto nfsmout;
                        }
                                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 {
                                skiplen = namlen - sizeof(dp->d_name) + 1;
                                namlen = sizeof(dp->d_name) - 1;
                        } else {
@@ -946,7 +1018,7 @@ nextbuffer:
                                space_free = nfs_dir_buf_freespace(bp, rdirplus);
                                dp = NFS_DIR_BUF_FIRST_DIRENTRY(bp);
                                /* increment with every buffer read */
                                space_free = nfs_dir_buf_freespace(bp, rdirplus);
                                dp = NFS_DIR_BUF_FIRST_DIRENTRY(bp);
                                /* increment with every buffer read */
-                               OSAddAtomic(1, &nfsstats.readdir_bios);
+                               OSAddAtomic64(1, &nfsstats.readdir_bios);
                        }
                        nmrepsave = nmrep;
                        dp->d_fileno = cookie; /* placeholder */
                        }
                        nmrepsave = nmrep;
                        dp->d_fileno = cookie; /* placeholder */
@@ -957,9 +1029,10 @@ nextbuffer:
                        nfsm_chain_get_opaque(error, &nmrep, namlen, dp->d_name);
                        nfsmout_if(error);
                        dp->d_name[namlen] = '\0';
                        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_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);
                        nfsmout_if(error);
                        nvattrp = rdirplus ? NFS_DIR_BUF_NVATTR(bp, ndbhp->ndbh_count) : &nvattr;
                        error = nfs4_parsefattr(&nmrep, NULL, nvattrp, &fh, NULL, NULL);
@@ -991,10 +1064,12 @@ nextbuffer:
                                continue;
                        }
 
                                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));
                                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;
                                dp->d_fileno = nvattrp->nva_fileid;
+                       }
                        if (rdirplus) {
                                /* fileid is already in d_fileno, so stash xid in attrs */
                                nvattrp->nva_fileid = savedxid;
                        if (rdirplus) {
                                /* fileid is already in d_fileno, so stash xid in attrs */
                                nvattrp->nva_fileid = savedxid;
@@ -1009,17 +1084,17 @@ nextbuffer:
                                                goto nextbuffer;
                                        }
                                        /* pack the file handle into the record */
                                                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);
                                } 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;
                                dp->d_reclen = reclen;
                        }
                        padstart = dp->d_name + dp->d_namlen + 1 + xlen;
@@ -1031,14 +1106,15 @@ nextbuffer:
                        ndbhp->ndbh_entry_end = (char*)dp - bp->nb_data;
                        /* zero out the pad bytes */
                        padlen = (char*)dp - padstart;
                        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);
                                bzero(padstart, padlen);
+                       }
                }
                /* Finally, get the eof boolean */
                nfsm_chain_get_32(error, &nmrep, eof);
                nfsmout_if(error);
                if (eof) {
                }
                /* 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);
                        nfs_node_lock_force(dnp);
                        dnp->n_eofcookie = lastcookie;
                        nfs_node_unlock(dnp);
@@ -1050,20 +1126,23 @@ nextbuffer:
                        bp = NULL;
                        break;
                }
                        bp = NULL;
                        break;
                }
-               if ((lockerror = nfs_node_lock(dnp)))
+               if ((lockerror = nfs_node_lock(dnp))) {
                        error = lockerror;
                        error = lockerror;
+               }
                nfsmout_if(error);
                nfsm_chain_cleanup(&nmrep);
                nfsm_chain_null(&nmreq);
        }
 nfsmout:
                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);
                nfs_buf_release(bp, 0);
-       if (!lockerror)
+       }
+       if (!lockerror) {
                nfs_node_unlock(dnp);
                nfs_node_unlock(dnp);
+       }
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (bp_dropped ? NFSERR_DIRBUFDROPPED : error);
+       return bp_dropped ? NFSERR_DIRBUFDROPPED : error;
 }
 
 int
 }
 
 int
@@ -1081,11 +1160,13 @@ nfs4_lookup_rpc_async(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(dnp);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(dnp);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        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;
 
        if ((name[0] == '.') && (name[1] == '.') && (namelen == 2)) {
                isdotdot = 1;
@@ -1099,7 +1180,7 @@ nfs4_lookup_rpc_async(
        // PUTFH, GETATTR, LOOKUP(P), GETFH, GETATTR (FH)
        numops = 5;
        nfsm_chain_build_alloc_init(error, &nmreq, 20 * NFSX_UNSIGNED + namelen);
        // PUTFH, GETATTR, LOOKUP(P), GETFH, GETATTR (FH)
        numops = 5;
        nfsm_chain_build_alloc_init(error, &nmreq, 20 * NFSX_UNSIGNED + namelen);
-       nfsm_chain_add_compound_header(error, &nmreq, "lookup", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "lookup", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
@@ -1119,21 +1200,24 @@ nfs4_lookup_rpc_async(
        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 */
        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);
                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);
                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);
                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,
        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);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
-       return (error);
+       return error;
 }
 
 
 }
 
 
@@ -1155,28 +1239,38 @@ nfs4_lookup_rpc_async_finish(
        struct nfsm_chain nmrep;
 
        nmp = NFSTONMP(dnp);
        struct nfsm_chain nmrep;
 
        nmp = NFSTONMP(dnp);
+       if (nmp == NULL) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        nfsvers = nmp->nm_vers;
-       if ((name[0] == '.') && (name[1] == '.') && (namelen == 2))
+       if ((name[0] == '.') && (name[1] == '.') && (namelen == 2)) {
                isdotdot = 1;
                isdotdot = 1;
+       }
 
        nfsm_chain_null(&nmrep);
 
        error = nfs_request_async_finish(req, &nmrep, &xid, &status);
 
 
        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;
                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_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;
                *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);
        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)) {
        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)) {
@@ -1188,8 +1282,9 @@ nfs4_lookup_rpc_async_finish(
                error = nfs4_parsefattr(&nmrep, NULL, nvap, NULL, NULL, NULL);
        }
 nfsmout:
                error = nfs4_parsefattr(&nmrep, NULL, nvap, NULL, NULL, NULL);
        }
 nfsmout:
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(dnp);
                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. */
        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. */
@@ -1199,18 +1294,20 @@ nfsmout:
                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 */
                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;
                        error = 0;
+               }
                if (!error) {
                        /* set our default security flavor to the first in the list */
                        lck_mtx_lock(&nmp->nm_lock);
                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_auth = sec.flavors[0];
+                       }
                        nmp->nm_state &= ~NFSSTA_NEEDSECINFO;
                        lck_mtx_unlock(&nmp->nm_lock);
                }
        }
                        nmp->nm_state &= ~NFSSTA_NEEDSECINFO;
                        lck_mtx_unlock(&nmp->nm_lock);
                }
        }
-       return (error);
+       return error;
 }
 
 int
 }
 
 int
@@ -1230,18 +1327,22 @@ nfs4_commit_rpc(
 
        nmp = NFSTONMP(np);
        FSDBG(521, np, offset, count, nmp ? nmp->nm_state : 0);
 
        nmp = NFSTONMP(np);
        FSDBG(521, np, offset, count, nmp ? nmp->nm_state : 0);
-       if (!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;
 
        nfsvers = nmp->nm_vers;
 
-       if (count > UINT32_MAX)
+       if (count > UINT32_MAX) {
                count32 = 0;
                count32 = 0;
-       else
+       } else {
                count32 = count;
                count32 = count;
+       }
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -1250,7 +1351,7 @@ nfs4_commit_rpc(
        // PUTFH, COMMIT, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 19 * NFSX_UNSIGNED);
        // PUTFH, COMMIT, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 19 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "commit", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "commit", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -1265,10 +1366,11 @@ nfs4_commit_rpc(
        nfsm_assert(error, (numops == 0), EPROTO);
        nfsmout_if(error);
        error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND,
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -1276,19 +1378,22 @@ nfs4_commit_rpc(
        nfsm_chain_get_64(error, &nmrep, newwverf);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
        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);
                nfs_node_unlock(np);
+       }
        nfsmout_if(error);
        lck_mtx_lock(&nmp->nm_lock);
        nfsmout_if(error);
        lck_mtx_lock(&nmp->nm_lock);
-       if (nmp->nm_verf != newwverf)
+       if (nmp->nm_verf != newwverf) {
                nmp->nm_verf = newwverf;
                nmp->nm_verf = newwverf;
-       if (wverf != newwverf)
+       }
+       if (wverf != newwverf) {
                error = NFSERR_STALEWRITEVERF;
                error = NFSERR_STALEWRITEVERF;
+       }
        lck_mtx_unlock(&nmp->nm_lock);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        lck_mtx_unlock(&nmp->nm_lock);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 int
 }
 
 int
@@ -1305,11 +1410,13 @@ nfs4_pathconf_rpc(
        struct nfs_vattr nvattr;
        struct nfsreq_secinfo_args si;
 
        struct nfs_vattr nvattr;
        struct nfsreq_secinfo_args si;
 
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        NVATTR_INIT(&nvattr);
@@ -1320,7 +1427,7 @@ nfs4_pathconf_rpc(
        // PUTFH, GETATTR
        numops = 2;
        nfsm_chain_build_alloc_init(error, &nmreq, 16 * NFSX_UNSIGNED);
        // PUTFH, GETATTR
        numops = 2;
        nfsm_chain_build_alloc_init(error, &nmreq, 16 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "pathconf", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "pathconf", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -1346,82 +1453,99 @@ nfs4_pathconf_rpc(
        nfsmout_if(error);
        error = nfs4_parsefattr(&nmrep, nfsap, &nvattr, NULL, NULL, NULL);
        nfsmout_if(error);
        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;
                error = lockerror;
-       if (!error)
+       }
+       if (!error) {
                nfs_loadattrcache(np, &nvattr, &xid, 0);
                nfs_loadattrcache(np, &nvattr, &xid, 0);
-       if (!lockerror)
+       }
+       if (!lockerror) {
                nfs_node_unlock(np);
                nfs_node_unlock(np);
+       }
 nfsmout:
        NVATTR_CLEANUP(&nvattr);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
 nfsmout:
        NVATTR_CLEANUP(&nvattr);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 int
 nfs4_vnop_getattr(
        struct vnop_getattr_args /* {
 }
 
 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;
        struct nfs_vattr nva;
        int error, acls, ngaflags;
 
 {
        struct vnode_attr *vap = ap->a_vap;
        struct nfsmount *nmp;
        struct nfs_vattr nva;
        int error, acls, ngaflags;
 
-       if (!(nmp = VTONMP(ap->a_vp)))
-               return (ENXIO);
+       nmp = VTONMP(ap->a_vp);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        acls = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_ACL);
 
        ngaflags = NGA_CACHED;
        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;
                ngaflags |= NGA_ACL;
+       }
        error = nfs_getattr(VTONFS(ap->a_vp), &nva, ap->a_context, ngaflags);
        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);
        }
 
        /* 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);
                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_size, nva.nva_size);
+       }
        // VATTR_RETURN(vap, va_data_alloc, ???);
        // VATTR_RETURN(vap, va_total_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);
                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);
                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);
                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);
                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);
                VATTR_RETURN(vap, va_guuid, nva.nva_guuid);
+       }
        if (VATTR_IS_ACTIVE(vap, va_mode)) {
        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);
                        VATTR_RETURN(vap, va_mode, 0777);
-               else
+               } else {
                        VATTR_RETURN(vap, va_mode, nva.nva_mode);
                        VATTR_RETURN(vap, va_mode, nva.nva_mode);
+               }
        }
        if (VATTR_IS_ACTIVE(vap, va_flags) &&
            (NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_ARCHIVE) ||
        }
        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) &&
                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;
                        flags |= SF_ARCHIVED;
+               }
                if (NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_HIDDEN) &&
                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;
                        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)) {
                VATTR_RETURN(vap, va_flags, flags);
        }
        if (VATTR_IS_ACTIVE(vap, va_create_time) && NFS_BITMAP_ISSET(nva.nva_bitmap, NFS_FATTR_TIME_CREATE)) {
@@ -1449,12 +1573,15 @@ nfs4_vnop_getattr(
                vap->va_backup_time.tv_nsec = nva.nva_timensec[NFSTIME_BACKUP];
                VATTR_SET_SUPPORTED(vap, va_backup_time);
        }
                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);
                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);
                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);
                VATTR_RETURN(vap, va_filerev, nva.nva_change);
+       }
 
        if (VATTR_IS_ACTIVE(vap, va_acl) && acls) {
                VATTR_RETURN(vap, va_acl, nva.nva_acl);
 
        if (VATTR_IS_ACTIVE(vap, va_acl) && acls) {
                VATTR_RETURN(vap, va_acl, nva.nva_acl);
@@ -1465,7 +1592,7 @@ nfs4_vnop_getattr(
        // VATTR_RETURN(vap, va_encoding, ??? /* potentially unnormalized UTF-8? */);
 
        NVATTR_CLEANUP(&nva);
        // VATTR_RETURN(vap, va_encoding, ??? /* potentially unnormalized UTF-8? */);
 
        NVATTR_CLEANUP(&nva);
-       return (error);
+       return error;
 }
 
 int
 }
 
 int
@@ -1484,35 +1611,43 @@ nfs4_setattr_rpc(
        nfs_stateid stateid;
        struct nfsreq_secinfo_args si;
 
        nfs_stateid stateid;
        struct nfsreq_secinfo_args si;
 
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        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!) */
                /* 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 */
        }
 
        /* 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);
                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);
                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);
                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);
                VATTR_CLEAR_ACTIVE(vap, va_guuid);
+       }
 
 tryagain:
        /* do nothing if no attributes will be sent */
        nfs_vattr_set_bitmap(nmp, bitmap, vap);
 
 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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -1526,24 +1661,26 @@ tryagain:
        NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, getbitmap);
        if (NFS_BITMAP_ISSET(bitmap, NFS_FATTR_ACL) ||
            NFS_BITMAP_ISSET(bitmap, NFS_FATTR_MODE)) {
        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);
                        NFS_BITMAP_SET(getbitmap, NFS_FATTR_ACL);
+               }
                NACLINVALIDATE(np);
        }
 
        // PUTFH, SETATTR, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 40 * NFSX_UNSIGNED);
                NACLINVALIDATE(np);
        }
 
        // PUTFH, SETATTR, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 40 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "setattr", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "setattr", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_SETATTR);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        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);
                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;
                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--;
        nfsm_chain_add_stateid(error, &nmreq, &stateid);
        nfsm_chain_add_fattr4(error, &nmreq, vap, nmp);
        numops--;
@@ -1554,8 +1691,9 @@ tryagain:
        nfsmout_if(error);
        error = nfs_request(np, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
 
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -1567,15 +1705,17 @@ tryagain:
        bmlen = NFS_ATTR_BITMAP_LEN;
        nfsm_chain_get_bitmap(error, &nmrep, setbitmap, bmlen);
        if (!error) {
        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);
                        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);
                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);
                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
        /*
         * 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
@@ -1592,8 +1732,9 @@ tryagain:
                NATTRINVALIDATE(np);
        }
 nfsmout:
                NATTRINVALIDATE(np);
        }
 nfsmout:
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(np);
                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)) {
        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)) {
@@ -1604,14 +1745,15 @@ nfsmout:
                 * but mode was already successfully set).
                 */
                if (((bitmap[0] & setbitmap[0]) != bitmap[0]) ||
                 * 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;
                }
        }
                        VATTR_CLEAR_ACTIVE(vap, va_mode);
                        error = 0;
                        goto tryagain;
                }
        }
-       return (error);
+       return error;
 }
 }
+#endif /* CONFIG_NFS4 */
 
 /*
  * Wait for any pending recovery to complete.
 
 /*
  * Wait for any pending recovery to complete.
@@ -1619,20 +1761,21 @@ nfsmout:
 int
 nfs_mount_state_wait_for_recovery(struct nfsmount *nmp)
 {
 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) {
        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;
                        break;
+               }
                nfs_mount_sock_thread_wake(nmp);
                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);
 
                slpflag = 0;
        }
        lck_mtx_unlock(&nmp->nm_lock);
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -1644,28 +1787,31 @@ nfs_mount_state_wait_for_recovery(struct nfsmount *nmp)
 int
 nfs_mount_state_in_use_start(struct nfsmount *nmp, thread_t thd)
 {
 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;
 
        int error = 0, slpflag = (NMFLAG(nmp, INTR) && thd) ? PCATCH : 0;
 
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        lck_mtx_lock(&nmp->nm_lock);
        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);
                lck_mtx_unlock(&nmp->nm_lock);
-               return (ENXIO);
+               return ENXIO;
        }
        while (nmp->nm_state & NFSSTA_RECOVER) {
        }
        while (nmp->nm_state & NFSSTA_RECOVER) {
-               if ((error = nfs_sigintr(nmp, NULL, thd, 1)))
+               if ((error = nfs_sigintr(nmp, NULL, thd, 1))) {
                        break;
                        break;
+               }
                nfs_mount_sock_thread_wake(nmp);
                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;
        }
                slpflag = 0;
        }
-       if (!error)
+       if (!error) {
                nmp->nm_stateinuse++;
                nmp->nm_stateinuse++;
+       }
        lck_mtx_unlock(&nmp->nm_lock);
 
        lck_mtx_unlock(&nmp->nm_lock);
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -1678,25 +1824,29 @@ nfs_mount_state_in_use_end(struct nfsmount *nmp, int error)
 {
        int restart = nfs_mount_state_error_should_restart(error);
 
 {
        int restart = nfs_mount_state_error_should_restart(error);
 
-       if (!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",
        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);
        }
                nfs_need_recover(nmp, error);
        }
-       if (nmp->nm_stateinuse > 0)
+       if (nmp->nm_stateinuse > 0) {
                nmp->nm_stateinuse--;
                nmp->nm_stateinuse--;
-       else
+       } else {
                panic("NFS mount state in use count underrun");
                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);
                wakeup(&nmp->nm_stateinuse);
+       }
        lck_mtx_unlock(&nmp->nm_lock);
        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;
 }
 
 /*
 }
 
 /*
@@ -1713,9 +1863,9 @@ nfs_mount_state_error_should_restart(int error)
        case NFSERR_OLD_STATEID:
        case NFSERR_BAD_STATEID:
        case NFSERR_GRACE:
        case NFSERR_OLD_STATEID:
        case NFSERR_BAD_STATEID:
        case NFSERR_GRACE:
-               return (1);
+               return 1;
        }
        }
-       return (0);
+       return 0;
 }
 
 /*
 }
 
 /*
@@ -1726,7 +1876,7 @@ nfs_mount_state_error_should_restart(int error)
 uint
 nfs_mount_state_max_restarts(struct nfsmount *nmp)
 {
 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);
 }
 
 /*
 }
 
 /*
@@ -1742,9 +1892,9 @@ nfs_mount_state_error_delegation_lost(int error)
        case NFSERR_OLD_STATEID:
        case NFSERR_BAD_STATEID:
        case NFSERR_GRACE: /* ugh! (stupid) RFC 3530 specifically disallows CLAIM_DELEGATE_CUR during grace period? */
        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;
 }
 
 
 }
 
 
@@ -1755,27 +1905,30 @@ int
 nfs_open_state_set_busy(nfsnode_t np, thread_t thd)
 {
        struct nfsmount *nmp;
 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);
        int error = 0, slpflag;
 
        nmp = NFSTONMP(np);
-       if (!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) {
        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;
                        break;
+               }
                np->n_openflags |= N_OPENWANT;
                msleep(&np->n_openflags, &np->n_openlock, slpflag, "nfs_open_state_set_busy", &ts);
                slpflag = 0;
        }
                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;
                np->n_openflags |= N_OPENBUSY;
+       }
        lck_mtx_unlock(&np->n_openlock);
 
        lck_mtx_unlock(&np->n_openlock);
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -1788,13 +1941,15 @@ nfs_open_state_clear_busy(nfsnode_t np)
        int wanted;
 
        lck_mtx_lock(&np->n_openlock);
        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");
                panic("nfs_open_state_clear_busy");
+       }
        wanted = (np->n_openflags & N_OPENWANT);
        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);
        lck_mtx_unlock(&np->n_openlock);
-       if (wanted)
+       if (wanted) {
                wakeup(&np->n_openflags);
                wakeup(&np->n_openflags);
+       }
 }
 
 /*
 }
 
 /*
@@ -1810,15 +1965,17 @@ nfs_open_owner_find(struct nfsmount *nmp, kauth_cred_t cred, int alloc)
 tryagain:
        lck_mtx_lock(&nmp->nm_lock);
        TAILQ_FOREACH(noop, &nmp->nm_open_owners, noo_link) {
 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;
                        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 (!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;
                bzero(newnoop, sizeof(*newnoop));
                lck_mtx_init(&newnoop->noo_lock, nfs_open_grp, LCK_ATTR_NULL);
                newnoop->noo_mount = nmp;
@@ -1830,18 +1987,21 @@ tryagain:
        }
        if (!noop && newnoop) {
                newnoop->noo_flags |= NFS_OPEN_OWNER_LINK;
        }
        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);
 
                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);
                nfs_open_owner_destroy(newnoop);
+       }
 
 
-       if (noop)
+       if (noop) {
                nfs_open_owner_ref(noop);
                nfs_open_owner_ref(noop);
+       }
 
 
-       return (noop);
+       return noop;
 }
 
 /*
 }
 
 /*
@@ -1850,8 +2010,9 @@ tryagain:
 void
 nfs_open_owner_destroy(struct nfs_open_owner *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);
                kauth_cred_unref(&noop->noo_cred);
+       }
        lck_mtx_destroy(&noop->noo_lock, nfs_open_grp);
        FREE(noop, M_TEMP);
 }
        lck_mtx_destroy(&noop->noo_lock, nfs_open_grp);
        FREE(noop, M_TEMP);
 }
@@ -1863,7 +2024,7 @@ void
 nfs_open_owner_ref(struct nfs_open_owner *noop)
 {
        lck_mtx_lock(&noop->noo_lock);
 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);
 }
 
        lck_mtx_unlock(&noop->noo_lock);
 }
 
@@ -1874,14 +2035,18 @@ nfs_open_owner_ref(struct nfs_open_owner *noop)
 void
 nfs_open_owner_rele(struct nfs_open_owner *noop)
 {
 void
 nfs_open_owner_rele(struct nfs_open_owner *noop)
 {
+       os_ref_count_t newcount;
+
        lck_mtx_lock(&noop->noo_lock);
        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");
                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");
                panic("nfs_open_owner_rele: busy");
+       }
        /* XXX we may potentially want to clean up idle/unused open owner structures */
        /* 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;
        }
                lck_mtx_unlock(&noop->noo_lock);
                return;
        }
@@ -1898,27 +2063,30 @@ int
 nfs_open_owner_set_busy(struct nfs_open_owner *noop, thread_t thd)
 {
        struct nfsmount *nmp;
 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;
        int error = 0, slpflag;
 
        nmp = noop->noo_mount;
-       if (!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) {
        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;
                        break;
+               }
                noop->noo_flags |= NFS_OPEN_OWNER_WANT;
                msleep(noop, &noop->noo_lock, slpflag, "nfs_open_owner_set_busy", &ts);
                slpflag = 0;
        }
                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;
                noop->noo_flags |= NFS_OPEN_OWNER_BUSY;
+       }
        lck_mtx_unlock(&noop->noo_lock);
 
        lck_mtx_unlock(&noop->noo_lock);
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -1931,13 +2099,15 @@ nfs_open_owner_clear_busy(struct nfs_open_owner *noop)
        int wanted;
 
        lck_mtx_lock(&noop->noo_lock);
        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");
                panic("nfs_open_owner_clear_busy");
+       }
        wanted = (noop->noo_flags & NFS_OPEN_OWNER_WANT);
        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);
        lck_mtx_unlock(&noop->noo_lock);
-       if (wanted)
+       if (wanted) {
                wakeup(noop);
                wakeup(noop);
+       }
 }
 
 /*
 }
 
 /*
@@ -1959,10 +2129,12 @@ nfs_owner_seqid_increment(struct nfs_open_owner *noop, struct nfs_lock_owner *nl
                /* do not increment the open seqid on these errors */
                return;
        }
                /* do not increment the open seqid on these errors */
                return;
        }
-       if (noop)
+       if (noop) {
                noop->noo_seqid++;
                noop->noo_seqid++;
-       if (nlop)
+       }
+       if (nlop) {
                nlop->nlo_seqid++;
                nlop->nlo_seqid++;
+       }
 }
 
 /*
 }
 
 /*
@@ -1999,20 +2171,22 @@ nfs_open_file_find_internal(
 {
        struct nfs_open_file *nofp = NULL, *nofp2, *newnofp = NULL;
 
 {
        struct nfs_open_file *nofp = NULL, *nofp2, *newnofp = NULL;
 
-       if (!np)
+       if (!np) {
                goto alloc;
                goto alloc;
+       }
 tryagain:
        lck_mtx_lock(&np->n_openlock);
        TAILQ_FOREACH(nofp2, &np->n_opens, nof_link) {
                if (nofp2->nof_owner == noop) {
                        nofp = nofp2;
 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;
                                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);
                }
                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;
                }
        }
 
                }
        }
 
@@ -2024,8 +2198,9 @@ tryagain:
                lck_mtx_unlock(&np->n_openlock);
 alloc:
                MALLOC(newnofp, struct nfs_open_file *, sizeof(struct nfs_open_file), M_TEMP, M_WAITOK);
                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;
                bzero(newnofp, sizeof(*newnofp));
                lck_mtx_init(&newnofp->nof_lock, nfs_open_grp, LCK_ATTR_NULL);
                newnofp->nof_owner = noop;
@@ -2034,8 +2209,9 @@ alloc:
                lck_mtx_lock(&noop->noo_lock);
                TAILQ_INSERT_HEAD(&noop->noo_opens, newnofp, nof_oolink);
                lck_mtx_unlock(&noop->noo_lock);
                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;
                        goto tryagain;
+               }
        }
        if (!nofp) {
                if (*nofpp) {
        }
        if (!nofp) {
                if (*nofpp) {
@@ -2044,17 +2220,20 @@ alloc:
                } else {
                        nofp = newnofp;
                }
                } else {
                        nofp = newnofp;
                }
-               if (nofp && np)
+               if (nofp && np) {
                        TAILQ_INSERT_HEAD(&np->n_opens, nofp, nof_link);
                        TAILQ_INSERT_HEAD(&np->n_opens, nofp, nof_link);
+               }
        }
        }
-       if (np)
+       if (np) {
                lck_mtx_unlock(&np->n_openlock);
                lck_mtx_unlock(&np->n_openlock);
+       }
 
 
-       if (alloc && newnofp && (nofp != newnofp))
+       if (alloc && newnofp && (nofp != newnofp)) {
                nfs_open_file_destroy(newnofp);
                nfs_open_file_destroy(newnofp);
+       }
 
        *nofpp = nofp;
 
        *nofpp = nofp;
-       return (nofp ? 0 : ESRCH);
+       return nofp ? 0 : ESRCH;
 }
 
 /*
 }
 
 /*
@@ -2079,27 +2258,30 @@ int
 nfs_open_file_set_busy(struct nfs_open_file *nofp, thread_t thd)
 {
        struct nfsmount *nmp;
 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;
        int error = 0, slpflag;
 
        nmp = nofp->nof_owner->noo_mount;
-       if (!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) {
        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;
                        break;
+               }
                nofp->nof_flags |= NFS_OPEN_FILE_WANT;
                msleep(nofp, &nofp->nof_lock, slpflag, "nfs_open_file_set_busy", &ts);
                slpflag = 0;
        }
                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;
                nofp->nof_flags |= NFS_OPEN_FILE_BUSY;
+       }
        lck_mtx_unlock(&nofp->nof_lock);
 
        lck_mtx_unlock(&nofp->nof_lock);
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -2112,13 +2294,15 @@ nfs_open_file_clear_busy(struct nfs_open_file *nofp)
        int wanted;
 
        lck_mtx_lock(&nofp->nof_lock);
        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");
                panic("nfs_open_file_clear_busy");
+       }
        wanted = (nofp->nof_flags & NFS_OPEN_FILE_WANT);
        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);
        lck_mtx_unlock(&nofp->nof_lock);
-       if (wanted)
+       if (wanted) {
                wakeup(nofp);
                wakeup(nofp);
+       }
 }
 
 /*
 }
 
 /*
@@ -2133,49 +2317,55 @@ nfs_open_file_add_open(struct nfs_open_file *nofp, uint32_t accessMode, uint32_t
 
        if (delegated) {
                if (denyMode == NFS_OPEN_SHARE_DENY_NONE) {
 
        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++;
                                nofp->nof_d_r++;
-                       else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+                       } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
                                nofp->nof_d_w++;
                                nofp->nof_d_w++;
-                       else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+                       } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
                                nofp->nof_d_rw++;
                                nofp->nof_d_rw++;
+                       }
                } else if (denyMode == NFS_OPEN_SHARE_DENY_WRITE) {
                } 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++;
                                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++;
                                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++;
                                nofp->nof_d_rw_dw++;
+                       }
                } else { /* NFS_OPEN_SHARE_DENY_BOTH */
                } 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++;
                                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++;
                                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++;
                                nofp->nof_d_rw_drw++;
+                       }
                }
        } else {
                if (denyMode == NFS_OPEN_SHARE_DENY_NONE) {
                }
        } 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++;
                                nofp->nof_r++;
-                       else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+                       } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
                                nofp->nof_w++;
                                nofp->nof_w++;
-                       else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+                       } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
                                nofp->nof_rw++;
                                nofp->nof_rw++;
+                       }
                } else if (denyMode == NFS_OPEN_SHARE_DENY_WRITE) {
                } 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++;
                                nofp->nof_r_dw++;
-                       else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+                       } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
                                nofp->nof_w_dw++;
                                nofp->nof_w_dw++;
-                       else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+                       } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
                                nofp->nof_rw_dw++;
                                nofp->nof_rw_dw++;
+                       }
                } else { /* NFS_OPEN_SHARE_DENY_BOTH */
                } else { /* NFS_OPEN_SHARE_DENY_BOTH */
-                       if (accessMode == NFS_OPEN_SHARE_ACCESS_READ)
+                       if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
                                nofp->nof_r_drw++;
                                nofp->nof_r_drw++;
-                       else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE)
+                       } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
                                nofp->nof_w_drw++;
                                nofp->nof_w_drw++;
-                       else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH)
+                       } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
                                nofp->nof_rw_drw++;
                                nofp->nof_rw_drw++;
+                       }
                }
        }
 
                }
        }
 
@@ -2206,65 +2396,72 @@ nfs_open_file_remove_open_find(
        if ((accessMode & NFS_OPEN_SHARE_ACCESS_READ) &&
            (nofp->nof_access & NFS_OPEN_SHARE_ACCESS_READ) &&
            ((nofp->nof_r + nofp->nof_d_r +
        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;
                *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 +
        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;
                *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 +
        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;
                *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 +
        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;
                *newDenyMode &= ~NFS_OPEN_SHARE_DENY_WRITE;
+       }
 
        /* Find the corresponding open access/deny mode counter. */
        if (denyMode == NFS_OPEN_SHARE_DENY_NONE) {
 
        /* 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);
                        *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);
                        *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);
                        *delegated = (nofp->nof_d_rw != 0);
-               else
+               } else {
                        *delegated = 0;
                        *delegated = 0;
+               }
        } else if (denyMode == NFS_OPEN_SHARE_DENY_WRITE) {
        } 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);
                        *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);
                        *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);
                        *delegated = (nofp->nof_d_rw_dw != 0);
-               else
+               } else {
                        *delegated = 0;
                        *delegated = 0;
+               }
        } else { /* NFS_OPEN_SHARE_DENY_BOTH */
        } 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);
                        *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);
                        *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);
                        *delegated = (nofp->nof_d_rw_drw != 0);
-               else
+               } else {
                        *delegated = 0;
                        *delegated = 0;
+               }
        }
 }
 
        }
 }
 
@@ -2284,115 +2481,133 @@ nfs_open_file_remove_open(struct nfs_open_file *nofp, uint32_t accessMode, uint3
        if (denyMode == NFS_OPEN_SHARE_DENY_NONE) {
                if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
                        if (delegated) {
        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));
                                        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--;
                                        nofp->nof_d_r--;
+                               }
                        } else {
                        } 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));
                                        NP(nofp->nof_np, "nfs: open(R) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
-                               else
+                               } else {
                                        nofp->nof_r--;
                                        nofp->nof_r--;
+                               }
                        }
                } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
                        if (delegated) {
                        }
                } 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));
                                        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--;
                                        nofp->nof_d_w--;
+                               }
                        } else {
                        } 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));
                                        NP(nofp->nof_np, "nfs: open(W) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
-                               else
+                               } else {
                                        nofp->nof_w--;
                                        nofp->nof_w--;
+                               }
                        }
                } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
                        if (delegated) {
                        }
                } 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));
                                        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--;
                                        nofp->nof_d_rw--;
+                               }
                        } else {
                        } 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));
                                        NP(nofp->nof_np, "nfs: open(RW) count underrun, %d", kauth_cred_getuid(nofp->nof_owner->noo_cred));
-                               else
+                               } else {
                                        nofp->nof_rw--;
                                        nofp->nof_rw--;
+                               }
                        }
                }
        } else if (denyMode == NFS_OPEN_SHARE_DENY_WRITE) {
                if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
                        if (delegated) {
                        }
                }
        } 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));
                                        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--;
                                        nofp->nof_d_r_dw--;
+                               }
                        } else {
                        } 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));
                                        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--;
                                        nofp->nof_r_dw--;
+                               }
                        }
                } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
                        if (delegated) {
                        }
                } 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));
                                        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--;
                                        nofp->nof_d_w_dw--;
+                               }
                        } else {
                        } 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));
                                        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--;
                                        nofp->nof_w_dw--;
+                               }
                        }
                } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
                        if (delegated) {
                        }
                } 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));
                                        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--;
                                        nofp->nof_d_rw_dw--;
+                               }
                        } else {
                        } 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));
                                        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--;
                                        nofp->nof_rw_dw--;
+                               }
                        }
                }
        } else { /* NFS_OPEN_SHARE_DENY_BOTH */
                if (accessMode == NFS_OPEN_SHARE_ACCESS_READ) {
                        if (delegated) {
                        }
                }
        } 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));
                                        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--;
                                        nofp->nof_d_r_drw--;
+                               }
                        } else {
                        } 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));
                                        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--;
                                        nofp->nof_r_drw--;
+                               }
                        }
                } else if (accessMode == NFS_OPEN_SHARE_ACCESS_WRITE) {
                        if (delegated) {
                        }
                } 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));
                                        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--;
                                        nofp->nof_d_w_drw--;
+                               }
                        } else {
                        } 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));
                                        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--;
                                        nofp->nof_w_drw--;
+                               }
                        }
                } else if (accessMode == NFS_OPEN_SHARE_ACCESS_BOTH) {
                        if (delegated) {
                        }
                } 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));
                                        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--;
                                        nofp->nof_d_rw_drw--;
+                               }
                        } else {
                        } 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));
                                        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--;
                                        nofp->nof_rw_drw--;
+                               }
                        }
                }
        }
                        }
                }
        }
@@ -2404,7 +2619,7 @@ nfs_open_file_remove_open(struct nfs_open_file *nofp, uint32_t accessMode, uint3
        lck_mtx_unlock(&nofp->nof_lock);
 }
 
        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.
 /*
  * Get the current (delegation, lock, open, default) stateid for this node.
  * If node has a delegation, use that stateid.
@@ -2425,20 +2640,23 @@ nfs_get_stateid(nfsnode_t np, thread_t thd, kauth_cred_t cred, nfs_stateid *sid)
        if (np->n_openflags & N_DELEG_MASK) {
                s = &np->n_dstateid;
        } else {
        if (np->n_openflags & N_DELEG_MASK) {
                s = &np->n_dstateid;
        } else {
-               if (p)
+               if (p) {
                        nlop = nfs_lock_owner_find(np, p, 0);
                        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))) &&
                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 */
                        /* 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);
                                nfs4_reopen(nofp, thd);
-                       if (!(nofp->nof_flags & NFS_OPEN_FILE_LOST))
+                       }
+                       if (!(nofp->nof_flags & NFS_OPEN_FILE_LOST)) {
                                s = &nofp->nof_stateid;
                                s = &nofp->nof_stateid;
+                       }
                }
        }
 
                }
        }
 
@@ -2449,14 +2667,17 @@ nfs_get_stateid(nfsnode_t np, thread_t thd, kauth_cred_t cred, nfs_stateid *sid)
                sid->other[2] = s->other[2];
        } else {
                /* named attributes may not have a stateid for reads, so don't complain for them */
                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");
                        NP(np, "nfs_get_stateid: no stateid");
+               }
                sid->seqid = sid->other[0] = sid->other[1] = sid->other[2] = 0xffffffff;
        }
                sid->seqid = sid->other[0] = sid->other[1] = sid->other[2] = 0xffffffff;
        }
-       if (nlop)
+       if (nlop) {
                nfs_lock_owner_rele(nlop);
                nfs_lock_owner_rele(nlop);
-       if (noop)
+       }
+       if (noop) {
                nfs_open_owner_rele(noop);
                nfs_open_owner_rele(noop);
+       }
 }
 
 
 }
 
 
@@ -2488,10 +2709,12 @@ nfs4_open_delegated(
 
 tryagain:
        action = 0;
 
 tryagain:
        action = 0;
-       if (accessMode & NFS_OPEN_SHARE_ACCESS_READ)
+       if (accessMode & NFS_OPEN_SHARE_ACCESS_READ) {
                action |= KAUTH_VNODE_READ_DATA;
                action |= KAUTH_VNODE_READ_DATA;
-       if (accessMode & NFS_OPEN_SHARE_ACCESS_WRITE)
+       }
+       if (accessMode & NFS_OPEN_SHARE_ACCESS_WRITE) {
                action |= KAUTH_VNODE_WRITE_DATA;
                action |= KAUTH_VNODE_WRITE_DATA;
+       }
 
        /* evaluate ACE (if we have one) */
        if (np->n_dace.ace_flags) {
 
        /* evaluate ACE (if we have one) */
        if (np->n_dace.ace_flags) {
@@ -2499,11 +2722,13 @@ tryagain:
                eval.ae_acl = &np->n_dace;
                eval.ae_count = 1;
                eval.ae_options = 0;
                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;
                        eval.ae_options |= KAUTH_AEVAL_IS_OWNER;
+               }
                error = kauth_cred_ismember_gid(cred, np->n_vattr.nva_gid, &ismember);
                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_options |= KAUTH_AEVAL_IN_GROUP;
+               }
 
                eval.ae_exp_gall = KAUTH_VNODE_GENERIC_ALL_BITS;
                eval.ae_exp_gread = KAUTH_VNODE_GENERIC_READ_BITS;
 
                eval.ae_exp_gall = KAUTH_VNODE_GENERIC_ALL_BITS;
                eval.ae_exp_gread = KAUTH_VNODE_GENERIC_READ_BITS;
@@ -2512,8 +2737,9 @@ tryagain:
 
                error = kauth_acl_evaluate(cred, &eval);
 
 
                error = kauth_acl_evaluate(cred, &eval);
 
-               if (!error && (eval.ae_result == KAUTH_RESULT_ALLOW))
+               if (!error && (eval.ae_result == KAUTH_RESULT_ALLOW)) {
                        authorized = 1;
                        authorized = 1;
+               }
        }
 
        if (!authorized) {
        }
 
        if (!authorized) {
@@ -2523,8 +2749,9 @@ tryagain:
                naa.a_vp = NFSTOV(np);
                naa.a_action = action;
                naa.a_context = ctx;
                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;
                        authorized = 1;
+               }
        }
 
        if (!authorized) {
        }
 
        if (!authorized) {
@@ -2534,12 +2761,12 @@ tryagain:
                        readtoo = 0;
                        goto tryagain;
                }
                        readtoo = 0;
                        goto tryagain;
                }
-               return (error ? error : EACCES);
+               return error ? error : EACCES;
        }
 
        nfs_open_file_add_open(nofp, accessMode, denyMode, 1);
 
        }
 
        nfs_open_file_add_open(nofp, accessMode, denyMode, 1);
 
-       return (0);
+       return 0;
 }
 
 
 }
 
 
@@ -2577,14 +2804,15 @@ nfs4_open(
         * use the delegation if it's being returned.
         */
        if (np->n_openflags & N_DELEG_MASK) {
         * 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) ||
                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);
                        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);
        }
                }
                nfs_open_state_clear_busy(np);
        }
@@ -2596,25 +2824,28 @@ nfs4_open(
         * from the n_parent we have stashed away.
         */
        if ((np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) &&
         * 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;
                dvp = NULL;
-       if (!dvp)
+       }
+       if (!dvp) {
                dvp = vnode_getparent(vp);
                dvp = vnode_getparent(vp);
+       }
        vname = vnode_getname(vp);
        if (!dvp || !vname) {
        vname = vnode_getname(vp);
        if (!dvp || !vname) {
-               if (!error)
+               if (!error) {
                        error = EIO;
                        error = EIO;
+               }
                goto out;
        }
        filename = &smallname[0];
        namelen = snprintf(filename, sizeof(smallname), "%s", vname);
        if (namelen >= sizeof(smallname)) {
                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;
                }
                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;
        }
        bzero(&cn, sizeof(cn));
        cn.cn_nameptr = filename;
@@ -2642,23 +2873,27 @@ tryagain:
        }
        nfs_open_file_add_open(nofp, accessMode, denyMode, 0);
 out:
        }
        nfs_open_file_add_open(nofp, accessMode, denyMode, 0);
 out:
-       if (filename && (filename != &smallname[0]))
+       if (filename && (filename != &smallname[0])) {
                FREE(filename, M_TEMP);
                FREE(filename, M_TEMP);
-       if (vname)
+       }
+       if (vname) {
                vnode_putname(vname);
                vnode_putname(vname);
-       if (dvp != NULLVP)
+       }
+       if (dvp != NULLVP) {
                vnode_put(dvp);
                vnode_put(dvp);
-       return (error);
+       }
+       return error;
 }
 }
+#endif /* CONFIG_NFS4 */
 
 int
 nfs_vnop_mmap(
        struct vnop_mmap_args /* {
 
 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;
 {
        vfs_context_t ctx = ap->a_context;
        vnode_t vp = ap->a_vp;
@@ -2669,13 +2904,16 @@ nfs_vnop_mmap(
        struct nfs_open_file *nofp = NULL;
 
        nmp = VTONMP(vp);
        struct nfs_open_file *nofp = NULL;
 
        nmp = VTONMP(vp);
-       if (!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
 
        /*
         * fflags contains some combination of: PROT_READ, PROT_WRITE
@@ -2683,25 +2921,27 @@ nfs_vnop_mmap(
         * read access is always there (regardless if PROT_READ is not set).
         */
        accessMode = NFS_OPEN_SHARE_ACCESS_READ;
         * 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;
                accessMode |= NFS_OPEN_SHARE_ACCESS_WRITE;
+       }
        denyMode = NFS_OPEN_SHARE_DENY_NONE;
 
        noop = nfs_open_owner_find(nmp, vfs_context_ucred(ctx), 1);
        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);
 
 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);
        }
        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);
        }
 
        error = nfs_open_file_find(np, noop, &nofp, 0, 0, 1);
@@ -2709,15 +2949,19 @@ restart:
                NP(np, "nfs_vnop_mmap: no open file for owner, error %d, %d", error, kauth_cred_getuid(noop->noo_cred));
                error = EPERM;
        }
                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 && (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;
                        goto restart;
+               }
        }
        }
-       if (!error)
+#endif
+       if (!error) {
                error = nfs_open_file_set_busy(nofp, NULL);
                error = nfs_open_file_set_busy(nofp, NULL);
+       }
        if (error) {
                nofp = NULL;
                goto out;
        if (error) {
                nofp = NULL;
                goto out;
@@ -2729,10 +2973,25 @@ restart:
         * So grab another open count matching the accessMode passed in.
         * If we already had an mmap open, prefer read/write without deny mode.
         * This means we may have to drop the current mmap open first.
         * So grab another open count matching the accessMode passed in.
         * If we already had an mmap open, prefer read/write without deny mode.
         * This means we may have to drop the current mmap open first.
+        *
+        * N.B. We should have an open for the mmap, because, mmap was
+        * called on an open descriptor, or we've created an open for read
+        * from reading the first page for execve. However, if we piggy
+        * backed on an existing NFS_OPEN_SHARE_ACCESS_READ/NFS_OPEN_SHARE_DENY_NONE
+        * that open may have closed.
         */
 
         */
 
-       if (!nofp->nof_access) {
-               if (accessMode != NFS_OPEN_SHARE_ACCESS_READ) {
+       if (!(nofp->nof_access & NFS_OPEN_SHARE_ACCESS_READ)) {
+               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)));
+               }
+               /*
+                * mmapings for execve are just for read. Get out with EPERM if the accessMode is not ACCESS_READ
+                * or the access would be denied. Other accesses should have an open descriptor for the mapping.
+                */
+               if (accessMode != NFS_OPEN_SHARE_ACCESS_READ || (accessMode & nofp->nof_deny)) {
                        /* not asking for just read access -> fail */
                        error = EPERM;
                        goto out;
                        /* not asking for just read access -> fail */
                        error = EPERM;
                        goto out;
@@ -2742,59 +3001,94 @@ restart:
                        /* 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;
                        /* 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);
                }
                        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;
                        nofp->nof_flags |= NFS_OPEN_FILE_NEEDCLOSE;
-               if (error)
+               }
+               if (error) {
                        goto out;
                        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;
        }
 
        /* 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;
                                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;
                                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;
                                denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+                       }
                } else if (nofp->nof_rw || nofp->nof_rw_dw || nofp->nof_rw_drw) {
                        delegated = 0;
                } 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;
                                denyMode = NFS_OPEN_SHARE_DENY_NONE;
-                       else if (nofp->nof_rw_dw)
+                       } else if (nofp->nof_rw_dw) {
                                denyMode = NFS_OPEN_SHARE_DENY_WRITE;
                                denyMode = NFS_OPEN_SHARE_DENY_WRITE;
-                       else if (nofp->nof_rw_drw)
+                       } else if (nofp->nof_rw_drw) {
                                denyMode = NFS_OPEN_SHARE_DENY_BOTH;
                                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;
                } 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;
                                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;
                                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;
                                denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+                       }
                } else if (nofp->nof_r || nofp->nof_r_dw || nofp->nof_r_drw) {
                        delegated = 0;
                } 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) {
+                               denyMode = NFS_OPEN_SHARE_DENY_WRITE;
+                       } 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
+                        * for a read only mmaping. We probably got here in that an
+                        * existing rw open for an executable file already exists.
+                        */
+                       delegated = 1;
+                       accessMode = NFS_OPEN_SHARE_ACCESS_BOTH;
+                       if (nofp->nof_d_rw) {
+                               denyMode = NFS_OPEN_SHARE_DENY_NONE;
+                       } else if (nofp->nof_d_rw_dw) {
+                               denyMode = NFS_OPEN_SHARE_DENY_WRITE;
+                       } 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) {
                                denyMode = NFS_OPEN_SHARE_DENY_NONE;
                                denyMode = NFS_OPEN_SHARE_DENY_NONE;
-                       else if (nofp->nof_r_dw)
+                       } else if (nofp->nof_rw_dw) {
                                denyMode = NFS_OPEN_SHARE_DENY_WRITE;
                                denyMode = NFS_OPEN_SHARE_DENY_WRITE;
-                       else if (nofp->nof_r_drw)
+                       } else if (nofp->nof_rw_drw) {
                                denyMode = NFS_OPEN_SHARE_DENY_BOTH;
                                denyMode = NFS_OPEN_SHARE_DENY_BOTH;
+                       }
                } else {
                        error = EPERM;
                }
        }
                } else {
                        error = EPERM;
                }
        }
-       if (error) /* mmap mode without proper open mode */
+       if (error) { /* mmap mode without proper open mode */
                goto out;
                goto out;
+       }
 
        /*
         * If the existing mmap access is more than the new access OR the
 
        /*
         * If the existing mmap access is more than the new access OR the
@@ -2802,15 +3096,17 @@ restart:
         * then we'll stick with the existing mmap open mode.
         */
        if ((nofp->nof_mmap_access > accessMode) ||
         * 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;
                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) {
 
        /* 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: 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;
                }
                        NP(np, "nfs_vnop_mmap: update, close error %d, %d", error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
                        goto out;
                }
@@ -2822,25 +3118,48 @@ restart:
        nofp->nof_mmap_deny = denyMode;
 
 out:
        nofp->nof_mmap_deny = denyMode;
 
 out:
-       if (nofp)
+       if (nofp) {
                nfs_open_file_clear_busy(nofp);
                nfs_open_file_clear_busy(nofp);
+       }
        if (nfs_mount_state_in_use_end(nmp, error)) {
                nofp = NULL;
                goto restart;
        }
        if (nfs_mount_state_in_use_end(nmp, error)) {
                nofp = NULL;
                goto restart;
        }
-       if (noop)
+       if (noop) {
                nfs_open_owner_rele(noop);
                nfs_open_owner_rele(noop);
-       return (error);
+       }
+
+       if (!error) {
+               int ismapped = 0;
+               nfs_node_lock_force(np);
+               if ((np->n_flag & NISMAPPED) == 0) {
+                       np->n_flag |= NISMAPPED;
+                       ismapped = 1;
+               }
+               nfs_node_unlock(np);
+               if (ismapped) {
+                       lck_mtx_lock(&nmp->nm_lock);
+                       nmp->nm_state &= ~NFSSTA_SQUISHY;
+                       nmp->nm_curdeadtimeout = nmp->nm_deadtimeout;
+                       if (nmp->nm_curdeadtimeout <= 0) {
+                               nmp->nm_deadto_start = 0;
+                       }
+                       nmp->nm_mappers++;
+                       lck_mtx_unlock(&nmp->nm_lock);
+               }
+       }
+
+       return error;
 }
 
 
 int
 nfs_vnop_mnomap(
        struct vnop_mnomap_args /* {
 }
 
 
 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;
 {
        vfs_context_t ctx = ap->a_context;
        vnode_t vp = ap->a_vp;
@@ -2849,34 +3168,59 @@ nfs_vnop_mnomap(
        struct nfs_open_file *nofp = NULL;
        off_t size;
        int error;
        struct nfs_open_file *nofp = NULL;
        off_t size;
        int error;
+       int is_mapped_flag = 0;
 
        nmp = VTONMP(vp);
 
        nmp = VTONMP(vp);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
+
+       nfs_node_lock_force(np);
+       if (np->n_flag & NISMAPPED) {
+               is_mapped_flag = 1;
+               np->n_flag &= ~NISMAPPED;
+       }
+       nfs_node_unlock(np);
+       if (is_mapped_flag) {
+               lck_mtx_lock(&nmp->nm_lock);
+               if (nmp->nm_mappers) {
+                       nmp->nm_mappers--;
+               } 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);
 
        /* 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);
                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);
 
        /* 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) {
        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;
                        continue;
+               }
                lck_mtx_unlock(&np->n_openlock);
                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 (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;
                                goto loop;
+                       }
                }
                }
-               if (!error)
+#endif
+               if (!error) {
                        error = nfs_open_file_set_busy(nofp, NULL);
                        error = nfs_open_file_set_busy(nofp, NULL);
+               }
                if (error) {
                        lck_mtx_lock(&np->n_openlock);
                        break;
                if (error) {
                        lck_mtx_lock(&np->n_openlock);
                        break;
@@ -2884,12 +3228,14 @@ loop:
                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 (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));
                                        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;
                        }
                                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));
                                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);
                }
                nfs_open_file_clear_busy(nofp);
                nfs_mount_state_in_use_end(nmp, error);
@@ -2897,7 +3243,7 @@ loop:
        }
        lck_mtx_unlock(&np->n_openlock);
        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;
 }
 
 /*
 }
 
 /*
@@ -2913,14 +3259,19 @@ nfs_lock_owner_find(nfsnode_t np, proc_t p, int alloc)
 tryagain:
        lck_mtx_lock(&np->n_openlock);
        TAILQ_FOREACH(nlop, &np->n_lock_owners, nlo_link) {
 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;
                        continue;
-               if (timevalcmp(&nlop->nlo_pid_start, &p->p_start, ==))
+               }
+               if (timevalcmp(&nlop->nlo_pid_start, &p->p_start, ==)) {
                        break;
                        break;
+               }
                /* stale lock owner... reuse it if we can */
                /* 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;
                        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;
                }
                        lck_mtx_unlock(&np->n_openlock);
                        goto tryagain;
                }
@@ -2933,8 +3284,9 @@ 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 (!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;
                bzero(newnlop, sizeof(*newnlop));
                lck_mtx_init(&newnlop->nlo_lock, nfs_open_grp, LCK_ATTR_NULL);
                newnlop->nlo_pid = pid;
@@ -2945,18 +3297,21 @@ tryagain:
        }
        if (!nlop && newnlop) {
                newnlop->nlo_flags |= NFS_LOCK_OWNER_LINK;
        }
        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);
 
                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);
                nfs_lock_owner_destroy(newnlop);
+       }
 
 
-       if (nlop)
+       if (nlop) {
                nfs_lock_owner_ref(nlop);
                nfs_lock_owner_ref(nlop);
+       }
 
 
-       return (nlop);
+       return nlop;
 }
 
 /*
 }
 
 /*
@@ -2980,7 +3335,7 @@ void
 nfs_lock_owner_ref(struct nfs_lock_owner *nlop)
 {
        lck_mtx_lock(&nlop->nlo_lock);
 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);
 }
 
        lck_mtx_unlock(&nlop->nlo_lock);
 }
 
@@ -2991,14 +3346,18 @@ nfs_lock_owner_ref(struct nfs_lock_owner *nlop)
 void
 nfs_lock_owner_rele(struct nfs_lock_owner *nlop)
 {
 void
 nfs_lock_owner_rele(struct nfs_lock_owner *nlop)
 {
+       os_ref_count_t newcount;
+
        lck_mtx_lock(&nlop->nlo_lock);
        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");
                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");
                panic("nfs_lock_owner_rele: busy");
+       }
        /* XXX we may potentially want to clean up idle/unused lock owner structures */
        /* 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;
        }
                lck_mtx_unlock(&nlop->nlo_lock);
                return;
        }
@@ -3015,27 +3374,30 @@ int
 nfs_lock_owner_set_busy(struct nfs_lock_owner *nlop, thread_t thd)
 {
        struct nfsmount *nmp;
 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;
        int error = 0, slpflag;
 
        nmp = nlop->nlo_open_owner->noo_mount;
-       if (!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) {
        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;
                        break;
+               }
                nlop->nlo_flags |= NFS_LOCK_OWNER_WANT;
                msleep(nlop, &nlop->nlo_lock, slpflag, "nfs_lock_owner_set_busy", &ts);
                slpflag = 0;
        }
                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;
                nlop->nlo_flags |= NFS_LOCK_OWNER_BUSY;
+       }
        lck_mtx_unlock(&nlop->nlo_lock);
 
        lck_mtx_unlock(&nlop->nlo_lock);
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -3048,13 +3410,15 @@ nfs_lock_owner_clear_busy(struct nfs_lock_owner *nlop)
        int wanted;
 
        lck_mtx_lock(&nlop->nlo_lock);
        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");
                panic("nfs_lock_owner_clear_busy");
+       }
        wanted = (nlop->nlo_flags & NFS_LOCK_OWNER_WANT);
        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);
        lck_mtx_unlock(&nlop->nlo_lock);
-       if (wanted)
+       if (wanted) {
                wakeup(nlop);
                wakeup(nlop);
+       }
 }
 
 /*
 }
 
 /*
@@ -3072,13 +3436,15 @@ nfs_lock_owner_insert_held_lock(struct nfs_lock_owner *nlop, struct nfs_file_loc
                TAILQ_INSERT_HEAD(&nlop->nlo_locks, newnflp, nfl_lolink);
        } else {
                TAILQ_FOREACH(nflp, &nlop->nlo_locks, nfl_lolink) {
                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;
                                break;
+                       }
                }
                }
-               if (nflp)
+               if (nflp) {
                        TAILQ_INSERT_BEFORE(nflp, newnflp, nfl_lolink);
                        TAILQ_INSERT_BEFORE(nflp, newnflp, nfl_lolink);
-               else
+               } else {
                        TAILQ_INSERT_TAIL(&nlop->nlo_locks, newnflp, nfl_lolink);
                        TAILQ_INSERT_TAIL(&nlop->nlo_locks, newnflp, nfl_lolink);
+               }
        }
        lck_mtx_unlock(&nlop->nlo_lock);
 }
        }
        lck_mtx_unlock(&nlop->nlo_lock);
 }
@@ -3099,14 +3465,15 @@ nfs_file_lock_alloc(struct nfs_lock_owner *nlop)
        lck_mtx_unlock(&nlop->nlo_lock);
        if (!nflp) {
                MALLOC(nflp, struct nfs_file_lock *, sizeof(struct nfs_file_lock), M_TEMP, M_WAITOK);
        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);
                bzero(nflp, sizeof(*nflp));
                nflp->nfl_flags |= NFS_FILE_LOCK_ALLOC;
                nflp->nfl_owner = nlop;
        }
        nfs_lock_owner_ref(nlop);
-       return (nflp);
+       return nflp;
 }
 
 /*
 }
 
 /*
@@ -3122,7 +3489,7 @@ nfs_file_lock_destroy(struct nfs_file_lock *nflp)
                FREE(nflp, M_TEMP);
        } else {
                lck_mtx_lock(&nlop->nlo_lock);
                FREE(nflp, M_TEMP);
        } else {
                lck_mtx_lock(&nlop->nlo_lock);
-               bzero(nflp, sizeof(nflp));
+               bzero(nflp, sizeof(*nflp));
                lck_mtx_unlock(&nlop->nlo_lock);
        }
        nfs_lock_owner_rele(nlop);
                lck_mtx_unlock(&nlop->nlo_lock);
        }
        nfs_lock_owner_rele(nlop);
@@ -3136,27 +3503,32 @@ int
 nfs_file_lock_conflict(struct nfs_file_lock *nflp1, struct nfs_file_lock *nflp2, int *willsplit)
 {
        /* no conflict if lock is dead */
 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) &&
        /* 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;
                        *willsplit = 1;
-               return (0);
+               }
+               return 0;
        }
        /* no conflict if ranges don't overlap */
        }
        /* 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 */
        /* 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 */
        /* conflict */
-       return (1);
+       return 1;
 }
 
 }
 
+#if CONFIG_NFS4
 /*
  * Send an NFSv4 LOCK RPC to the server.
  */
 /*
  * Send an NFSv4 LOCK RPC to the server.
  */
@@ -3179,27 +3551,30 @@ nfs4_setlock_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!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) ?
 
        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 (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);
                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);
                }
                if (!nlop->nlo_open_owner) {
                        nfs_open_owner_ref(nofp->nof_owner);
@@ -3212,7 +3587,7 @@ nfs4_setlock_rpc(
                        nfs_open_owner_clear_busy(nofp->nof_owner);
                        nfs_open_file_clear_busy(nofp);
                }
                        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);
        }
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
@@ -3222,7 +3597,7 @@ nfs4_setlock_rpc(
        // PUTFH, GETATTR, LOCK
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 33 * NFSX_UNSIGNED);
        // PUTFH, GETATTR, LOCK
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 33 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "lock", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "lock", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, NFS_VER4, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, NFS_VER4, np->n_fhp, np->n_fhsize);
@@ -3249,10 +3624,11 @@ nfs4_setlock_rpc(
        nfsm_assert(error, (numops == 0), EPROTO);
        nfsmout_if(error);
 
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -3266,11 +3642,13 @@ nfs4_setlock_rpc(
 
        /* 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). */
 
        /* 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;
                nlop->nlo_stategenid = nmp->nm_stategenid;
+       }
 nfsmout:
 nfsmout:
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(np);
                nfs_node_unlock(np);
+       }
        nfs_lock_owner_clear_busy(nlop);
        if (newlocker) {
                nfs_open_owner_clear_busy(nofp->nof_owner);
        nfs_lock_owner_clear_busy(nlop);
        if (newlocker) {
                nfs_open_owner_clear_busy(nofp->nof_owner);
@@ -3278,7 +3656,7 @@ nfsmout:
        }
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        }
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -3302,14 +3680,17 @@ nfs4_unlock_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!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);
 
        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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -3318,7 +3699,7 @@ nfs4_unlock_rpc(
        // PUTFH, GETATTR, LOCKU
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 26 * NFSX_UNSIGNED);
        // PUTFH, GETATTR, LOCKU
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 26 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "unlock", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "unlock", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, NFS_VER4, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, NFS_VER4, np->n_fhp, np->n_fhsize);
@@ -3336,10 +3717,11 @@ nfs4_unlock_rpc(
        nfsm_assert(error, (numops == 0), EPROTO);
        nfsmout_if(error);
 
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -3351,12 +3733,13 @@ nfs4_unlock_rpc(
        nfs_owner_seqid_increment(NULL, nlop, error);
        nfsm_chain_get_stateid(error, &nmrep, &nlop->nlo_stateid);
 nfsmout:
        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_node_unlock(np);
+       }
        nfs_lock_owner_clear_busy(nlop);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        nfs_lock_owner_clear_busy(nlop);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -3379,10 +3762,12 @@ nfs4_getlock_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!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);
 
        lockerror = ENOENT;
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
@@ -3392,7 +3777,7 @@ nfs4_getlock_rpc(
        // PUTFH, GETATTR, LOCKT
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 26 * NFSX_UNSIGNED);
        // PUTFH, GETATTR, LOCKT
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 26 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "locktest", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "locktest", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, NFS_VER4, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, NFS_VER4, np->n_fhp, np->n_fhsize);
@@ -3411,8 +3796,9 @@ nfs4_getlock_rpc(
 
        error = nfs_request(np, NULL, &nmreq, NFSPROC4_COMPOUND, ctx, &si, &nmrep, &xid, &status);
 
 
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -3434,13 +3820,14 @@ nfs4_getlock_rpc(
                fl->l_type = F_UNLCK;
        }
 nfsmout:
                fl->l_type = F_UNLCK;
        }
 nfsmout:
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(np);
                nfs_node_unlock(np);
+       }
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 }
-
+#endif /* CONFIG_NFS4 */
 
 /*
  * Check for any conflicts with the given lock.
 
 /*
  * Check for any conflicts with the given lock.
@@ -3463,21 +3850,25 @@ nfs_advlock_getlock(
        int error = 0, answered = 0;
 
        nmp = NFSTONMP(np);
        int error = 0, answered = 0;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
 
 restart:
 
 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) {
 
        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;
                        continue;
+               }
                if ((start <= nflp->nfl_end) && (end >= nflp->nfl_start) &&
                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;
                        break;
+               }
        }
        if (nflp) {
                /* found a conflicting lock */
        }
        if (nflp) {
                /* found a conflicting lock */
@@ -3498,15 +3889,16 @@ restart:
        lck_mtx_unlock(&np->n_openlock);
        if (answered) {
                nfs_mount_state_in_use_end(nmp, 0);
        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);
 
        }
 
        /* 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;
                goto restart;
-       return (error);
+       }
+       return error;
 }
 
 /*
 }
 
 /*
@@ -3536,25 +3928,29 @@ nfs_advlock_setlock(
        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 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);
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        slpflag = NMFLAG(nmp, INTR) ? PCATCH : 0;
 
        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);
 
        /* 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;
        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 |= NFS_FILE_LOCK_WAIT;
+       }
        newnflp->nfl_flags |= style;
        newnflp->nfl_flags |= NFS_FILE_LOCK_BLOCKED;
 
        newnflp->nfl_flags |= style;
        newnflp->nfl_flags |= NFS_FILE_LOCK_BLOCKED;
 
@@ -3566,18 +3962,21 @@ nfs_advlock_setlock(
                 * have a shared flock-style lock.
                 */
                nflp = TAILQ_FIRST(&nlop->nlo_locks);
                 * 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;
                        nflp = NULL;
-               if (nflp && (nflp->nfl_type != F_RDLCK))
+               }
+               if (nflp && (nflp->nfl_type != F_RDLCK)) {
                        nflp = NULL;
                        nflp = NULL;
+               }
                flocknflp = nflp;
        }
 
 restart:
        restart = 0;
        error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
                flocknflp = nflp;
        }
 
 restart:
        restart = 0;
        error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
-       if (error)
+       if (error) {
                goto error_out;
                goto error_out;
+       }
        inuse = 1;
        if (np->n_flag & NREVOKE) {
                error = EIO;
        inuse = 1;
        if (np->n_flag & NREVOKE) {
                error = EIO;
@@ -3585,14 +3984,17 @@ restart:
                inuse = 0;
                goto error_out;
        }
                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 (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 error_out;
+               }
                goto restart;
        }
                goto restart;
        }
+#endif
 
        lck_mtx_lock(&np->n_openlock);
        if (!inqueue) {
 
        lck_mtx_lock(&np->n_openlock);
        if (!inqueue) {
@@ -3604,8 +4006,9 @@ restart:
        /* 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);
        /* 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;
                        continue;
+               }
                /* Conflict */
                if (!(newnflp->nfl_flags & NFS_FILE_LOCK_WAIT)) {
                        error = EAGAIN;
                /* Conflict */
                if (!(newnflp->nfl_flags & NFS_FILE_LOCK_WAIT)) {
                        error = EAGAIN;
@@ -3625,8 +4028,9 @@ restart:
                                inuse = 0;
                                error = nfs_advlock_unlock(np, nofp, nlop, 0, UINT64_MAX, NFS_FILE_LOCK_STYLE_FLOCK, ctx);
                                flocknflp = NULL;
                                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));
                                        error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
+                               }
                                if (error) {
                                        lck_mtx_lock(&np->n_openlock);
                                        break;
                                if (error) {
                                        lck_mtx_lock(&np->n_openlock);
                                        break;
@@ -3634,8 +4038,9 @@ restart:
                                inuse = 1;
                                lck_mtx_lock(&np->n_openlock);
                                /* no need to block/sleep if the conflict is gone */
                                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;
                                        break;
+                               }
                        }
                        msleep(nflp, &np->n_openlock, slpflag, "nfs_advlock_setlock_blocked", &ts);
                        slpflag = 0;
                        }
                        msleep(nflp, &np->n_openlock, slpflag, "nfs_advlock_setlock_blocked", &ts);
                        slpflag = 0;
@@ -3649,25 +4054,29 @@ restart:
                                lck_mtx_lock(&np->n_openlock);
                                break;
                        }
                                lck_mtx_lock(&np->n_openlock);
                                break;
                        }
-                       if (!error && (np->n_flag & NREVOKE))
+                       if (!error && (np->n_flag & NREVOKE)) {
                                error = EIO;
                                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);
                }
                } 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;
                        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);
                /* 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;
                goto restart;
-       if (error)
+       }
+       if (error) {
                goto error_out;
                goto error_out;
+       }
 
        if (willsplit) {
                /*
 
        if (willsplit) {
                /*
@@ -3683,11 +4092,13 @@ restart:
        }
 
        /* once scan for local conflicts is clear, send request to server */
        }
 
        /* 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;
                goto error_out;
+       }
        busy = 1;
        delay = 0;
        do {
        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) {
                /* 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) {
@@ -3708,23 +4119,28 @@ restart:
                                 * with an open it knows about.
                                 */
                                if ((!nofp->nof_rw_drw && !nofp->nof_w_drw && !nofp->nof_r_drw &&
                                 * 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_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);
                                        error = nfs4_claim_delegated_state_for_open_file(nofp, 0);
-                                       if (error)
+                                       if (error) {
                                                break;
                                                break;
+                                       }
                                }
                        }
                }
                                }
                        }
                }
-               if (np->n_flag & NREVOKE)
+#endif
+               if (np->n_flag & NREVOKE) {
                        error = EIO;
                        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));
                        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;
                        break;
+               }
                /* request was denied due to either conflict or grace period */
                if ((error == NFSERR_DENIED) && !(newnflp->nfl_flags & NFS_FILE_LOCK_WAIT)) {
                        error = EAGAIN;
                /* request was denied due to either conflict or grace period */
                if ((error == NFSERR_DENIED) && !(newnflp->nfl_flags & NFS_FILE_LOCK_WAIT)) {
                        error = EAGAIN;
@@ -3738,8 +4154,9 @@ restart:
                        inuse = 0;
                        error2 = nfs_advlock_unlock(np, nofp, nlop, 0, UINT64_MAX, NFS_FILE_LOCK_STYLE_FLOCK, ctx);
                        flocknflp = NULL;
                        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));
                                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));
                        if (!error2) {
                                inuse = 1;
                                error2 = nfs_open_state_set_busy(np, vfs_context_thread(ctx));
@@ -3755,11 +4172,13 @@ restart:
                 * Except for retries of blocked v2/v3 request where we've already waited a bit.
                 */
                if ((nmp->nm_vers >= NFS_VER4) || (error == NFSERR_GRACE)) {
                 * 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;
                                delay = 4;
-                       if (delay < 4)
+                       }
+                       if (delay < 4) {
                                delay++;
                                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);
                        slpflag = 0;
                }
                error = nfs_sigintr(NFSTONMP(np), NULL, vfs_context_thread(ctx), 0);
@@ -3771,8 +4190,9 @@ restart:
                        inuse = 0;
                        goto restart;
                }
                        inuse = 0;
                        goto restart;
                }
-               if (!error && (np->n_flag & NREVOKE))
+               if (!error && (np->n_flag & NREVOKE)) {
                        error = EIO;
                        error = EIO;
+               }
        } while (!error);
 
 error_out:
        } while (!error);
 
 error_out:
@@ -3797,17 +4217,22 @@ error_out:
                        wakeup(newnflp);
                } else {
                        /* remove newnflp from lock list and destroy */
                        wakeup(newnflp);
                } else {
                        /* remove newnflp from lock list and destroy */
-                       TAILQ_REMOVE(&np->n_locks, newnflp, nfl_link);
+                       if (inqueue) {
+                               TAILQ_REMOVE(&np->n_locks, newnflp, nfl_link);
+                       }
                        nfs_file_lock_destroy(newnflp);
                }
                lck_mtx_unlock(&np->n_openlock);
                        nfs_file_lock_destroy(newnflp);
                }
                lck_mtx_unlock(&np->n_openlock);
-               if (busy)
+               if (busy) {
                        nfs_open_state_clear_busy(np);
                        nfs_open_state_clear_busy(np);
-               if (inuse)
+               }
+               if (inuse) {
                        nfs_mount_state_in_use_end(nmp, error);
                        nfs_mount_state_in_use_end(nmp, error);
-               if (nflp2)
+               }
+               if (nflp2) {
                        nfs_file_lock_destroy(nflp2);
                        nfs_file_lock_destroy(nflp2);
-               return (error);
+               }
+               return error;
        }
 
        /* server granted the lock */
        }
 
        /* server granted the lock */
@@ -3820,16 +4245,21 @@ error_out:
         * It's possible that a single lock may need to be split.
         */
        TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
         * 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;
                        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;
                        continue;
-               if (nflp->nfl_owner != nlop)
+               }
+               if (nflp->nfl_owner != nlop) {
                        continue;
                        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;
                        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;
                        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. */
                /* here's one to update */
                if ((newnflp->nfl_start <= nflp->nfl_start) && (newnflp->nfl_end >= nflp->nfl_end)) {
                        /* The entire lock is being replaced. */
@@ -3842,7 +4272,7 @@ error_out:
                        /* 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. */
                        /* 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;
                        nflp2->nfl_type = nflp->nfl_type;
                        nflp2->nfl_start = newnflp->nfl_end + 1;
                        nflp2->nfl_end = nflp->nfl_end;
@@ -3885,12 +4315,15 @@ error_out:
                 * checking locks that are further down the list.
                 */
                TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
                 * 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;
                                continue;
-                       if (nflp->nfl_owner != nlop)
+                       }
+                       if (nflp->nfl_owner != nlop) {
                                continue;
                                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;
                                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) &&
                        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) &&
@@ -3910,8 +4343,9 @@ error_out:
                                TAILQ_REMOVE(&nlop->nlo_locks, nflp, nfl_lolink);
                                lck_mtx_unlock(&nlop->nlo_lock);
                        }
                                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;
                                continue;
+                       }
                        if (nflp->nfl_blockcnt) {
                                /* wake up anyone blocked on this lock */
                                wakeup(nflp);
                        if (nflp->nfl_blockcnt) {
                                /* wake up anyone blocked on this lock */
                                wakeup(nflp);
@@ -3927,9 +4361,10 @@ error_out:
        nfs_open_state_clear_busy(np);
        nfs_mount_state_in_use_end(nmp, error);
 
        nfs_open_state_clear_busy(np);
        nfs_mount_state_in_use_end(nmp, error);
 
-       if (nflp2)
+       if (nflp2) {
                nfs_file_lock_destroy(nflp2);
                nfs_file_lock_destroy(nflp2);
-       return (error);
+       }
+       return error;
 }
 
 /*
 }
 
 /*
@@ -3938,7 +4373,11 @@ error_out:
 int
 nfs_advlock_unlock(
        nfsnode_t np,
 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,
        struct nfs_lock_owner *nlop,
        uint64_t start,
        uint64_t end,
@@ -3950,22 +4389,27 @@ nfs_advlock_unlock(
        int error = 0, willsplit = 0, send_unlock_rpcs = 1;
 
        nmp = NFSTONMP(np);
        int error = 0, willsplit = 0, send_unlock_rpcs = 1;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
 
 restart:
 
 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 (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;
        }
                goto restart;
        }
+#endif
        if ((error = nfs_open_state_set_busy(np, NULL))) {
                nfs_mount_state_in_use_end(nmp, error);
        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);
        }
 
        lck_mtx_lock(&np->n_openlock);
@@ -3976,14 +4420,18 @@ restart:
                 * going to be one, we'll allocate one now.
                 */
                TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
                 * 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;
                                continue;
-                       if (nflp->nfl_owner != nlop)
+                       }
+                       if (nflp->nfl_owner != nlop) {
                                continue;
                                continue;
-                       if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != style)
+                       }
+                       if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != style) {
                                continue;
                                continue;
-                       if ((start > nflp->nfl_end) || (end < nflp->nfl_start))
+                       }
+                       if ((start > nflp->nfl_end) || (end < nflp->nfl_start)) {
                                continue;
                                continue;
+                       }
                        if ((start > nflp->nfl_start) && (end < nflp->nfl_end)) {
                                willsplit = 1;
                                break;
                        if ((start > nflp->nfl_start) && (end < nflp->nfl_end)) {
                                willsplit = 1;
                                break;
@@ -3994,8 +4442,9 @@ restart:
                        nfs_open_state_clear_busy(np);
                        nfs_mount_state_in_use_end(nmp, 0);
                        newnflp = nfs_file_lock_alloc(nlop);
                        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;
                }
        }
                        goto restart;
                }
        }
@@ -4004,7 +4453,7 @@ restart:
         * Free all of our locks in the given range.
         *
         * Note that this process requires sending requests to the server.
         * 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.
         * 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.
@@ -4018,8 +4467,9 @@ restart:
         */
        if ((style == NFS_FILE_LOCK_STYLE_POSIX) &&
            ((nflp = TAILQ_FIRST(&nlop->nlo_locks))) &&
         */
        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;
                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 ((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) &&
@@ -4032,52 +4482,58 @@ restart:
                        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);
                        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 (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;
                                        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,
                        }
                        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 (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;
                                goto out;
+                       }
                }
                send_unlock_rpcs = 0;
        }
 
        TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
                }
                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;
                        continue;
-               if (nflp->nfl_owner != nlop)
+               }
+               if (nflp->nfl_owner != nlop) {
                        continue;
                        continue;
-               if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != style)
+               }
+               if ((nflp->nfl_flags & NFS_FILE_LOCK_STYLE_MASK) != style) {
                        continue;
                        continue;
-               if ((start > nflp->nfl_end) || (end < nflp->nfl_start))
+               }
+               if ((start > nflp->nfl_end) || (end < nflp->nfl_start)) {
                        continue;
                        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,
                /* 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);
                                if (nfs_mount_state_error_should_restart(error)) {
                                        nfs_open_state_clear_busy(np);
                                        nfs_mount_state_in_use_end(nmp, error);
@@ -4086,8 +4542,9 @@ restart:
                                lck_mtx_lock(&np->n_openlock);
                        }
                        nextnflp = TAILQ_NEXT(nflp, nfl_link);
                                lck_mtx_lock(&np->n_openlock);
                        }
                        nextnflp = TAILQ_NEXT(nflp, nfl_link);
-                       if (error)
+                       if (error) {
                                break;
                                break;
+                       }
                        nflp->nfl_flags |= NFS_FILE_LOCK_DEAD;
                        lck_mtx_lock(&nlop->nlo_lock);
                        TAILQ_REMOVE(&nlop->nlo_locks, nflp, nfl_lolink);
                        nflp->nfl_flags |= NFS_FILE_LOCK_DEAD;
                        lck_mtx_lock(&nlop->nlo_lock);
                        TAILQ_REMOVE(&nlop->nlo_locks, nflp, nfl_lolink);
@@ -4099,7 +4556,7 @@ restart:
                        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,
                        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);
                                if (nfs_mount_state_error_should_restart(error)) {
                                        nfs_open_state_clear_busy(np);
                                        nfs_mount_state_in_use_end(nmp, error);
@@ -4107,10 +4564,11 @@ restart:
                                }
                                lck_mtx_lock(&np->n_openlock);
                        }
                                }
                                lck_mtx_lock(&np->n_openlock);
                        }
-                       if (error)
+                       if (error) {
                                break;
                                break;
+                       }
                        /* update locks and insert new lock after current lock */
                        /* 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;
                        newnflp->nfl_type = nflp->nfl_type;
                        newnflp->nfl_start = end + 1;
                        newnflp->nfl_end = nflp->nfl_end;
@@ -4124,7 +4582,7 @@ restart:
                        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,
                        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);
                                if (nfs_mount_state_error_should_restart(error)) {
                                        nfs_open_state_clear_busy(np);
                                        nfs_mount_state_in_use_end(nmp, error);
@@ -4133,15 +4591,16 @@ restart:
                                lck_mtx_lock(&np->n_openlock);
                        }
                        nextnflp = TAILQ_NEXT(nflp, nfl_link);
                                lck_mtx_lock(&np->n_openlock);
                        }
                        nextnflp = TAILQ_NEXT(nflp, nfl_link);
-                       if (error)
+                       if (error) {
                                break;
                                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,
                        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);
                                if (nfs_mount_state_error_should_restart(error)) {
                                        nfs_open_state_clear_busy(np);
                                        nfs_mount_state_in_use_end(nmp, error);
@@ -4150,8 +4609,9 @@ restart:
                                lck_mtx_lock(&np->n_openlock);
                        }
                        nextnflp = TAILQ_NEXT(nflp, nfl_link);
                                lck_mtx_lock(&np->n_openlock);
                        }
                        nextnflp = TAILQ_NEXT(nflp, nfl_link);
-                       if (error)
+                       if (error) {
                                break;
                                break;
+                       }
                        nflp->nfl_start = end + 1;
                }
                if (nflp->nfl_blockcnt) {
                        nflp->nfl_start = end + 1;
                }
                if (nflp->nfl_blockcnt) {
@@ -4168,9 +4628,10 @@ out:
        nfs_open_state_clear_busy(np);
        nfs_mount_state_in_use_end(nmp, 0);
 
        nfs_open_state_clear_busy(np);
        nfs_mount_state_in_use_end(nmp, 0);
 
-       if (newnflp)
+       if (newnflp) {
                nfs_file_lock_destroy(newnflp);
                nfs_file_lock_destroy(newnflp);
-       return (error);
+       }
+       return error;
 }
 
 /*
 }
 
 /*
@@ -4179,14 +4640,14 @@ out:
 int
 nfs_vnop_advlock(
        struct vnop_advlock_args /* {
 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);
 {
        vnode_t vp = ap->a_vp;
        nfsnode_t np = VTONFS(ap->a_vp);
@@ -4205,22 +4666,26 @@ nfs_vnop_advlock(
 #define OFF_MAX QUAD_MAX
 
        nmp = VTONMP(ap->a_vp);
 #define OFF_MAX QUAD_MAX
 
        nmp = VTONMP(ap->a_vp);
-       if (!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);
        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);
 
        }
        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);
        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) {
 
        /* Convert the flock structure into a start and end. */
        switch (fl->l_whence) {
@@ -4235,54 +4700,65 @@ nfs_vnop_advlock(
        case SEEK_END:
                /* need to flush, and refetch attributes to make */
                /* sure we have the correct end of file offset   */
        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);
                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) ||
                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;
                        error = EOVERFLOW;
+               }
                lstart = np->n_size + fl->l_start;
                nfs_data_unlock(np);
                lstart = np->n_size + fl->l_start;
                nfs_data_unlock(np);
-               if (error)
-                       return (error);
+               if (error) {
+                       return error;
+               }
                break;
        default:
                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) {
        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 */
                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;
        }
                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;
 
        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;
 
        /* 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);
                        NP(np, "nfs_vnop_advlock: no lock owner, error %d", error);
+               }
                goto out;
        }
 
                goto out;
        }
 
@@ -4297,20 +4773,26 @@ nfs_vnop_advlock(
                        goto out;
                }
                /* find the open file */
                        goto out;
                }
                /* find the open file */
+#if CONFIG_NFS4
 restart:
 restart:
+#endif
                error = nfs_open_file_find(np, noop, &nofp, 0, 0, 0);
                error = nfs_open_file_find(np, noop, &nofp, 0, 0, 0);
-               if (error)
+               if (error) {
                        error = EBADF;
                        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 (!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 && (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;
                                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 (error) {
                        NP(np, "nfs_vnop_advlock: no open file %d, %d", error, kauth_cred_getuid(noop->noo_cred));
                        goto out;
@@ -4318,8 +4800,9 @@ restart:
                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_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;
                                op = F_SETLKW;
+                       }
                        error = nfs_advlock_setlock(np, nofp, nlop, op, start, end, style, fl->l_type, ctx);
                } else {
                        /* not getlk, unlock or lock? */
                        error = nfs_advlock_setlock(np, nofp, nlop, op, start, end, style, fl->l_type, ctx);
                } else {
                        /* not getlk, unlock or lock? */
@@ -4328,11 +4811,13 @@ restart:
        }
 
 out:
        }
 
 out:
-       if (nlop)
+       if (nlop) {
                nfs_lock_owner_rele(nlop);
                nfs_lock_owner_rele(nlop);
-       if (noop)
+       }
+       if (noop) {
                nfs_open_owner_rele(noop);
                nfs_open_owner_rele(noop);
-       return (error);
+       }
+       return error;
 }
 
 /*
 }
 
 /*
@@ -4344,14 +4829,17 @@ nfs_check_for_locks(struct nfs_open_owner *noop, struct nfs_open_file *nofp)
        struct nfs_lock_owner *nlop;
 
        TAILQ_FOREACH(nlop, &nofp->nof_np->n_lock_owners, nlo_link) {
        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;
                        continue;
-               if (!TAILQ_EMPTY(&nlop->nlo_locks))
+               }
+               if (!TAILQ_EMPTY(&nlop->nlo_locks)) {
                        break;
                        break;
+               }
        }
        }
-       return (nlop ? 1 : 0);
+       return nlop ? 1 : 0;
 }
 
 }
 
+#if CONFIG_NFS4
 /*
  * Reopen simple (no deny, no locks) open state that was lost.
  */
 /*
  * Reopen simple (no deny, no locks) open state that was lost.
  */
@@ -4370,18 +4858,19 @@ nfs4_reopen(struct nfs_open_file *nofp, thread_t thd)
        char smallname[128];
        char *filename = NULL;
        int error = 0, done = 0, slpflag = NMFLAG(nmp, INTR) ? PCATCH : 0;
        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) {
 
        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;
                        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);
                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);
        }
        nofp->nof_flags |= NFS_OPEN_FILE_REOPENING;
        lck_mtx_unlock(&nofp->nof_lock);
@@ -4395,6 +4884,7 @@ nfs4_reopen(struct nfs_open_file *nofp, thread_t thd)
                struct nfs_sillyrename *nsp = np->n_sillyrename;
                dvp = NFSTOV(nsp->nsr_dnp);
                if ((error = vnode_get(dvp))) {
                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;
                }
                        nfs_node_unlock(np);
                        goto out;
                }
@@ -4407,14 +4897,17 @@ nfs4_reopen(struct nfs_open_file *nofp, thread_t thd)
                 * from the n_parent we have stashed away.
                 */
                if ((np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) &&
                 * 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;
                        dvp = NULL;
-               if (!dvp)
+               }
+               if (!dvp) {
                        dvp = vnode_getparent(vp);
                        dvp = vnode_getparent(vp);
+               }
                vname = vnode_getname(vp);
                if (!dvp || !vname) {
                vname = vnode_getname(vp);
                if (!dvp || !vname) {
-                       if (!error)
+                       if (!error) {
                                error = EIO;
                                error = EIO;
+                       }
                        nfs_node_unlock(np);
                        goto out;
                }
                        nfs_node_unlock(np);
                        goto out;
                }
@@ -4423,12 +4916,12 @@ nfs4_reopen(struct nfs_open_file *nofp, thread_t thd)
        filename = &smallname[0];
        namelen = snprintf(filename, sizeof(smallname), "%s", name);
        if (namelen >= sizeof(smallname)) {
        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;
                }
                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));
        }
        nfs_node_unlock(np);
        bzero(&cn, sizeof(cn));
@@ -4437,43 +4930,53 @@ nfs4_reopen(struct nfs_open_file *nofp, thread_t thd)
 
 restart:
        done = 0;
 
 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;
                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);
                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);
                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);
                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 (nfs_mount_state_in_use_end(nmp, error)) {
-               if (error == NFSERR_GRACE)
+               if (error == NFSERR_GRACE) {
                        goto restart;
                        goto restart;
+               }
                printf("nfs4_reopen: RPC failed, error %d, lost %d, %s\n", error,
                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:
                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);
                nfs_revoke_open_state_for_node(np);
+       }
        lck_mtx_lock(&nofp->nof_lock);
        nofp->nof_flags &= ~NFS_OPEN_FILE_REOPENING;
        lck_mtx_lock(&nofp->nof_lock);
        nofp->nof_flags &= ~NFS_OPEN_FILE_REOPENING;
-       if (done)
+       if (done) {
                nofp->nof_flags &= ~NFS_OPEN_FILE_REOPEN;
                nofp->nof_flags &= ~NFS_OPEN_FILE_REOPEN;
-       else if (error)
+       } else if (error) {
                printf("nfs4_reopen: failed, error %d, lost %d, %s\n", 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);
        lck_mtx_unlock(&nofp->nof_lock);
-       if (filename && (filename != &smallname[0]))
+       if (filename && (filename != &smallname[0])) {
                FREE(filename, M_TEMP);
                FREE(filename, M_TEMP);
-       if (vname)
+       }
+       if (vname) {
                vnode_putname(vname);
                vnode_putname(vname);
-       if (dvp != NULLVP)
+       }
+       if (dvp != NULLVP) {
                vnode_put(dvp);
                vnode_put(dvp);
-       return (error);
+       }
+       return error;
 }
 
 /*
 }
 
 /*
@@ -4491,8 +4994,8 @@ nfs4_open_rpc(
        int share_access,
        int share_deny)
 {
        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);
 }
 
 /*
 }
 
 /*
@@ -4509,7 +5012,7 @@ nfs4_open_reopen_rpc(
        int share_access,
        int 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);
 }
 
 /*
 }
 
 /*
@@ -4539,7 +5042,7 @@ nfs4_open_confirm_rpc(
        // PUTFH, OPEN_CONFIRM, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 23 * NFSX_UNSIGNED);
        // PUTFH, OPEN_CONFIRM, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 23 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "open_confirm", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "open_confirm", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nmp->nm_vers, fhp, fhlen);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nmp->nm_vers, fhp, fhlen);
@@ -4568,7 +5071,7 @@ nfs4_open_confirm_rpc(
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -4612,16 +5115,19 @@ nfs4_open_rpc_internal(
        struct kauth_ace ace;
        struct nfsreq_secinfo_args si;
 
        struct kauth_ace ace;
        struct nfsreq_secinfo_args si;
 
-       if (create && !ctx)
-               return (EINVAL);
+       if (create && !ctx) {
+               return EINVAL;
+       }
 
        nmp = VTONMP(dvp);
 
        nmp = VTONMP(dvp);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        namedattrs = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR);
        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) {
 
        np = *vpp ? VTONFS(*vpp) : NULL;
        if (create && vap) {
@@ -4629,8 +5135,9 @@ nfs4_open_rpc_internal(
                nfs_avoid_needless_id_setting_on_create(dnp, vap, ctx);
                gotuid = VATTR_IS_ACTIVE(vap, va_uid);
                gotgid = VATTR_IS_ACTIVE(vap, va_gid);
                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;
                        vap->va_vaflags |= VA_UTIMES_NULL;
+               }
        } else {
                exclusive = gotuid = gotgid = 0;
        }
        } else {
                exclusive = gotuid = gotgid = 0;
        }
@@ -4641,8 +5148,9 @@ nfs4_open_rpc_internal(
                sid = &stateid;
        }
 
                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;
 again:
        rflags = delegation = recall = 0;
        ace.ace_flags = 0;
@@ -4657,7 +5165,7 @@ again:
        // PUTFH, SAVEFH, OPEN(CREATE?), GETATTR(FH), RESTOREFH, GETATTR
        numops = 6;
        nfsm_chain_build_alloc_init(error, &nmreq, 53 * NFSX_UNSIGNED + cnp->cn_namelen);
        // PUTFH, SAVEFH, OPEN(CREATE?), GETATTR(FH), RESTOREFH, GETATTR
        numops = 6;
        nfsm_chain_build_alloc_init(error, &nmreq, 53 * NFSX_UNSIGNED + cnp->cn_namelen);
-       nfsm_chain_add_compound_header(error, &nmreq, create ? "create" : "open", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, create ? "create" : "open", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
@@ -4699,26 +5207,31 @@ again:
        nfsm_chain_add_bitmap_supported(error, &nmreq, nfs_getattr_bitmap, nmp, dnp);
        nfsm_chain_build_done(error, &nmreq);
        nfsm_assert(error, (numops == 0), EPROTO);
        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);
                error = busyerror = nfs_node_set_busy(dnp, thd);
+       }
        nfsmout_if(error);
 
        nfsmout_if(error);
 
-       if (create && !namedattrs)
+       if (create && !namedattrs) {
                nfs_dulookup_init(&dul, dnp, cnp->cn_nameptr, cnp->cn_namelen, ctx);
                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) {
 
        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);
                        nfs_dulookup_start(&dul, dnp, ctx);
+               }
                error = nfs_request_async_finish(req, &nmrep, &xid, &status);
                savedxid = xid;
        }
 
                error = nfs_request_async_finish(req, &nmrep, &xid, &status);
                savedxid = xid;
        }
 
-       if (create && !namedattrs)
+       if (create && !namedattrs) {
                nfs_dulookup_finish(&dul, dnp, ctx);
                nfs_dulookup_finish(&dul, dnp, ctx);
+       }
 
 
-       if ((lockerror = nfs_node_lock(dnp)))
+       if ((lockerror = nfs_node_lock(dnp))) {
                error = lockerror;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -4732,7 +5245,7 @@ again:
        bmlen = NFS_ATTR_BITMAP_LEN;
        nfsm_chain_get_bitmap(error, &nmrep, bitmap, bmlen);
        nfsm_chain_get_32(error, &nmrep, delegation);
        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;
                switch (delegation) {
                case NFS_OPEN_DELEGATE_NONE:
                        break;
@@ -4740,8 +5253,9 @@ again:
                case NFS_OPEN_DELEGATE_WRITE:
                        nfsm_chain_get_stateid(error, &nmrep, &dstateid);
                        nfsm_chain_get_32(error, &nmrep, recall);
                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);
                                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);
                        /* 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);
@@ -4752,35 +5266,42 @@ again:
                        ace.ace_flags |= nfs4_ace_nfsflags_to_vfsflags(ace_flags);
                        ace.ace_rights = nfs4_ace_nfsmask_to_vfsrights(ace_mask);
                        if (!error && (len >= slen)) {
                        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;
                                        ace.ace_flags = 0;
+                               }
                        }
                        }
-                       if (s)
+                       if (s) {
                                nfsm_chain_get_opaque(error, &nmrep, len, s);
                                nfsm_chain_get_opaque(error, &nmrep, len, s);
-                       else
+                       } else {
                                nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
                                nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
+                       }
                        if (!error && s) {
                                s[len] = '\0';
                        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;
                                        ace.ace_flags = 0;
+                               }
                        }
                        }
-                       if (error || !s)
+                       if (error || !s) {
                                ace.ace_flags = 0;
                                ace.ace_flags = 0;
-                       if (s && (s != sbuf))
+                       }
+                       if (s && (s != sbuf)) {
                                FREE(s, M_TEMP);
                                FREE(s, M_TEMP);
+                       }
                        break;
                default:
                        error = EBADRPC;
                        break;
                }
                        break;
                default:
                        error = EBADRPC;
                        break;
                }
+       }
        /* At this point if we have no error, the object was created/opened. */
        open_error = error;
        nfsmout_if(error);
        /* 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);
                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);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        nfsmout_if(error);
        error = nfs4_parsefattr(&nmrep, NULL, &nvattr, &fh, NULL, NULL);
@@ -4793,19 +5314,22 @@ again:
        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 (!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");
                        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);
        }
        /* 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);
                NATTRINVALIDATE(dnp);
+       }
        nfsmout_if(error);
 
        nfsmout_if(error);
 
-       if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX)
+       if (rflags & NFS_OPEN_RESULT_LOCKTYPE_POSIX) {
                nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
                nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+       }
 
        if (rflags & NFS_OPEN_RESULT_CONFIRM) {
                nfs_node_unlock(dnp);
 
        if (rflags & NFS_OPEN_RESULT_CONFIRM) {
                nfs_node_unlock(dnp);
@@ -4814,8 +5338,9 @@ again:
                error = nfs4_open_confirm_rpc(nmp, dnp, fh.fh_data, fh.fh_len, noop, sid, thd, cred, &nvattr, &xid);
                nfsmout_if(error);
                savedxid = xid;
                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;
                        error = lockerror;
+               }
        }
 
 nfsmout:
        }
 
 nfsmout:
@@ -4832,21 +5357,25 @@ nfsmout:
                lockerror = ENOENT;
                nfs_getattr(dnp, NULL, ctx, NGA_CACHED);
        }
                lockerror = ENOENT;
                nfs_getattr(dnp, NULL, ctx, NGA_CACHED);
        }
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(dnp);
                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 && !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);
                        newvp = NFSTOV(newnp);
+               }
        }
        NVATTR_CLEANUP(&nvattr);
        }
        NVATTR_CLEANUP(&nvattr);
-       if (!busyerror)
+       if (!busyerror) {
                nfs_node_clear_busy(dnp);
                nfs_node_clear_busy(dnp);
+       }
        if ((delegation == NFS_OPEN_DELEGATE_READ) || (delegation == NFS_OPEN_DELEGATE_WRITE)) {
        if ((delegation == NFS_OPEN_DELEGATE_READ) || (delegation == NFS_OPEN_DELEGATE_WRITE)) {
-               if (!np)
+               if (!np) {
                        np = newnp;
                        np = newnp;
+               }
                if (!error && np && !recall) {
                        /* stuff the delegation state in the node */
                        lck_mtx_lock(&np->n_openlock);
                if (!error && np && !recall) {
                        /* stuff the delegation state in the node */
                        lck_mtx_lock(&np->n_openlock);
@@ -4856,8 +5385,9 @@ nfsmout:
                        np->n_dace = ace;
                        if (np->n_dlink.tqe_next == NFSNOLIST) {
                                lck_mtx_lock(&nmp->nm_lock);
                        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);
                                        TAILQ_INSERT_TAIL(&nmp->nm_delegations, np, n_dlink);
+                               }
                                lck_mtx_unlock(&nmp->nm_lock);
                        }
                        lck_mtx_unlock(&np->n_openlock);
                                lck_mtx_unlock(&nmp->nm_lock);
                        }
                        lck_mtx_unlock(&np->n_openlock);
@@ -4873,8 +5403,9 @@ nfsmout:
                                        np->n_dace = ace;
                                        if (np->n_dlink.tqe_next == NFSNOLIST) {
                                                lck_mtx_lock(&nmp->nm_lock);
                                        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);
                                                        TAILQ_INSERT_TAIL(&nmp->nm_delegations, np, n_dlink);
+                                               }
                                                lck_mtx_unlock(&nmp->nm_lock);
                                        }
                                        lck_mtx_unlock(&np->n_openlock);
                                                lck_mtx_unlock(&nmp->nm_lock);
                                        }
                                        lck_mtx_unlock(&np->n_openlock);
@@ -4884,8 +5415,9 @@ nfsmout:
                                /* return np's current delegation */
                                nfs4_delegation_return(np, 0, thd, cred);
                        }
                                /* 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);
                                nfs4_delegreturn_rpc(nmp, fh.fh_data, fh.fh_len, &dstateid, 0, thd, cred);
+                       }
                }
        }
        if (error) {
                }
        }
        if (error) {
@@ -4909,13 +5441,14 @@ nfsmout:
                                error = nfs4_setattr_rpc(newnp, vap, ctx);
                        }
                }
                                error = nfs4_setattr_rpc(newnp, vap, ctx);
                        }
                }
-               if (error)
+               if (error) {
                        vnode_put(newvp);
                        vnode_put(newvp);
-               else
+               } else {
                        *vpp = newvp;
                        *vpp = newvp;
+               }
        }
        nfs_open_owner_clear_busy(noop);
        }
        nfs_open_owner_clear_busy(noop);
-       return (error);
+       return error;
 }
 
 
 }
 
 
@@ -4953,8 +5486,9 @@ nfs4_claim_delegated_open_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
 
        nfs_node_lock_force(np);
        nfsvers = nmp->nm_vers;
 
        nfs_node_lock_force(np);
@@ -4966,6 +5500,7 @@ nfs4_claim_delegated_open_rpc(
                struct nfs_sillyrename *nsp = np->n_sillyrename;
                dvp = NFSTOV(nsp->nsr_dnp);
                if ((error = vnode_get(dvp))) {
                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;
                }
                        nfs_node_unlock(np);
                        goto out;
                }
@@ -4978,14 +5513,17 @@ nfs4_claim_delegated_open_rpc(
                 * from the n_parent we have stashed away.
                 */
                if ((np->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR) &&
                 * 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;
                        dvp = NULL;
-               if (!dvp)
+               }
+               if (!dvp) {
                        dvp = vnode_getparent(NFSTOV(np));
                        dvp = vnode_getparent(NFSTOV(np));
+               }
                vname = vnode_getname(NFSTOV(np));
                if (!dvp || !vname) {
                vname = vnode_getname(NFSTOV(np));
                if (!dvp || !vname) {
-                       if (!error)
+                       if (!error) {
                                error = EIO;
                                error = EIO;
+                       }
                        nfs_node_unlock(np);
                        goto out;
                }
                        nfs_node_unlock(np);
                        goto out;
                }
@@ -4994,18 +5532,19 @@ nfs4_claim_delegated_open_rpc(
        filename = &smallname[0];
        namelen = snprintf(filename, sizeof(smallname), "%s", name);
        if (namelen >= sizeof(smallname)) {
        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;
                if (!filename) {
                        error = ENOMEM;
+                       nfs_node_unlock(np);
                        goto out;
                }
                        goto out;
                }
-               snprintf(filename, namelen+1, "%s", name);
+               snprintf(filename, namelen + 1, "%s", name);
        }
        nfs_node_unlock(np);
 
        }
        nfs_node_unlock(np);
 
-       if ((error = nfs_open_owner_set_busy(noop, NULL)))
-               return (error);
-
+       if ((error = nfs_open_owner_set_busy(noop, NULL))) {
+               goto out;
+       }
        NVATTR_INIT(&nvattr);
        delegation = NFS_OPEN_DELEGATE_NONE;
        dstateid = np->n_dstateid;
        NVATTR_INIT(&nvattr);
        delegation = NFS_OPEN_DELEGATE_NONE;
        dstateid = np->n_dstateid;
@@ -5017,7 +5556,7 @@ nfs4_claim_delegated_open_rpc(
        // PUTFH, OPEN, GETATTR(FH)
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 48 * NFSX_UNSIGNED);
        // PUTFH, OPEN, GETATTR(FH)
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 48 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "open_claim_d", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "open_claim_d", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, VTONFS(dvp)->n_fhp, VTONFS(dvp)->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, VTONFS(dvp)->n_fhp, VTONFS(dvp)->n_fhsize);
@@ -5046,10 +5585,11 @@ nfs4_claim_delegated_open_rpc(
        nfsmout_if(error);
 
        error = nfs_request2(np, nmp->nm_mountp, &nmreq, NFSPROC4_COMPOUND, current_thread(),
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -5062,25 +5602,27 @@ nfs4_claim_delegated_open_rpc(
        bmlen = NFS_ATTR_BITMAP_LEN;
        nfsm_chain_get_bitmap(error, &nmrep, bitmap, bmlen);
        nfsm_chain_get_32(error, &nmrep, delegation);
        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 */
                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) &&
                        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) &&
                            (((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",
                                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);
                        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);
                                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);
                        /* 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);
@@ -5091,25 +5633,30 @@ nfs4_claim_delegated_open_rpc(
                        ace.ace_flags |= nfs4_ace_nfsflags_to_vfsflags(ace_flags);
                        ace.ace_rights = nfs4_ace_nfsmask_to_vfsrights(ace_mask);
                        if (!error && (len >= slen)) {
                        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;
                                        ace.ace_flags = 0;
+                               }
                        }
                        }
-                       if (s)
+                       if (s) {
                                nfsm_chain_get_opaque(error, &nmrep, len, s);
                                nfsm_chain_get_opaque(error, &nmrep, len, s);
-                       else
+                       } else {
                                nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
                                nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
+                       }
                        if (!error && s) {
                                s[len] = '\0';
                        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;
                                        ace.ace_flags = 0;
+                               }
                        }
                        }
-                       if (error || !s)
+                       if (error || !s) {
                                ace.ace_flags = 0;
                                ace.ace_flags = 0;
-                       if (s && (s != sbuf))
+                       }
+                       if (s && (s != sbuf)) {
                                FREE(s, M_TEMP);
                                FREE(s, M_TEMP);
+                       }
                        if (!error) {
                                /* stuff the latest delegation state in the node */
                                lck_mtx_lock(&np->n_openlock);
                        if (!error) {
                                /* stuff the latest delegation state in the node */
                                lck_mtx_lock(&np->n_openlock);
@@ -5119,8 +5666,9 @@ nfs4_claim_delegated_open_rpc(
                                np->n_dace = ace;
                                if (np->n_dlink.tqe_next == NFSNOLIST) {
                                        lck_mtx_lock(&nmp->nm_lock);
                                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);
                                                TAILQ_INSERT_TAIL(&nmp->nm_delegations, np, n_dlink);
+                                       }
                                        lck_mtx_unlock(&nmp->nm_lock);
                                }
                                lck_mtx_unlock(&np->n_openlock);
                                        lck_mtx_unlock(&nmp->nm_lock);
                                }
                                lck_mtx_unlock(&np->n_openlock);
@@ -5130,6 +5678,7 @@ nfs4_claim_delegated_open_rpc(
                        error = EBADRPC;
                        break;
                }
                        error = EBADRPC;
                        break;
                }
+       }
        nfsmout_if(error);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        error = nfs4_parsefattr(&nmrep, NULL, &nvattr, &fh, NULL, NULL);
        nfsmout_if(error);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        error = nfs4_parsefattr(&nmrep, NULL, &nvattr, &fh, NULL, NULL);
@@ -5142,19 +5691,22 @@ nfs4_claim_delegated_open_rpc(
        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 (!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 : "???");
                        printf("nfs4_claim_delegated_open_rpc: warning: file handle mismatch %s\n", filename ? filename : "???");
+               }
        }
        error = nfs_loadattrcache(np, &nvattr, &xid, 1);
        nfsmout_if(error);
        }
        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;
                nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+       }
 nfsmout:
        NVATTR_CLEANUP(&nvattr);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
 nfsmout:
        NVATTR_CLEANUP(&nvattr);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(np);
                nfs_node_unlock(np);
+       }
        nfs_open_owner_clear_busy(noop);
        if ((delegation == NFS_OPEN_DELEGATE_READ) || (delegation == NFS_OPEN_DELEGATE_WRITE)) {
                if (recall) {
        nfs_open_owner_clear_busy(noop);
        if ((delegation == NFS_OPEN_DELEGATE_READ) || (delegation == NFS_OPEN_DELEGATE_WRITE)) {
                if (recall) {
@@ -5168,14 +5720,17 @@ nfsmout:
        }
 out:
        // if (!error)
        }
 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);
                FREE(filename, M_TEMP);
-       if (vname)
+       }
+       if (vname) {
                vnode_putname(vname);
                vnode_putname(vname);
-       if (dvp != NULLVP)
+       }
+       if (dvp != NULLVP) {
                vnode_put(dvp);
                vnode_put(dvp);
-       return (error);
+       }
+       return error;
 }
 
 /*
 }
 
 /*
@@ -5205,12 +5760,14 @@ nfs4_open_reclaim_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
 
        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;
 
        NVATTR_INIT(&nvattr);
        delegation = NFS_OPEN_DELEGATE_NONE;
@@ -5223,7 +5780,7 @@ nfs4_open_reclaim_rpc(
        // PUTFH, OPEN, GETATTR(FH)
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 48 * NFSX_UNSIGNED);
        // PUTFH, OPEN, GETATTR(FH)
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 48 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "open_reclaim", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "open_reclaim", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -5241,8 +5798,8 @@ nfs4_open_reclaim_rpc(
        // open_claim4
        nfsm_chain_add_32(error, &nmreq, NFS_CLAIM_PREVIOUS);
        delegation = (np->n_openflags & N_DELEG_READ) ? NFS_OPEN_DELEGATE_READ :
        // 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--;
        nfsm_chain_add_32(error, &nmreq, delegation);
        delegation = NFS_OPEN_DELEGATE_NONE;
        numops--;
@@ -5255,10 +5812,11 @@ nfs4_open_reclaim_rpc(
        nfsmout_if(error);
 
        error = nfs_request2(np, nmp->nm_mountp, &nmreq, NFSPROC4_COMPOUND, current_thread(),
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -5271,7 +5829,7 @@ nfs4_open_reclaim_rpc(
        bmlen = NFS_ATTR_BITMAP_LEN;
        nfsm_chain_get_bitmap(error, &nmrep, bitmap, bmlen);
        nfsm_chain_get_32(error, &nmrep, delegation);
        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) {
                switch (delegation) {
                case NFS_OPEN_DELEGATE_NONE:
                        if (np->n_openflags & N_DELEG_MASK) {
@@ -5290,8 +5848,9 @@ nfs4_open_reclaim_rpc(
                case NFS_OPEN_DELEGATE_WRITE:
                        nfsm_chain_get_stateid(error, &nmrep, &dstateid);
                        nfsm_chain_get_32(error, &nmrep, recall);
                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);
                                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);
                        /* 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);
@@ -5302,25 +5861,30 @@ nfs4_open_reclaim_rpc(
                        ace.ace_flags |= nfs4_ace_nfsflags_to_vfsflags(ace_flags);
                        ace.ace_rights = nfs4_ace_nfsmask_to_vfsrights(ace_mask);
                        if (!error && (len >= slen)) {
                        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;
                                        ace.ace_flags = 0;
+                               }
                        }
                        }
-                       if (s)
+                       if (s) {
                                nfsm_chain_get_opaque(error, &nmrep, len, s);
                                nfsm_chain_get_opaque(error, &nmrep, len, s);
-                       else
+                       } else {
                                nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
                                nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
+                       }
                        if (!error && s) {
                                s[len] = '\0';
                        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;
                                        ace.ace_flags = 0;
+                               }
                        }
                        }
-                       if (error || !s)
+                       if (error || !s) {
                                ace.ace_flags = 0;
                                ace.ace_flags = 0;
-                       if (s && (s != sbuf))
+                       }
+                       if (s && (s != sbuf)) {
                                FREE(s, M_TEMP);
                                FREE(s, M_TEMP);
+                       }
                        if (!error) {
                                /* stuff the delegation state in the node */
                                lck_mtx_lock(&np->n_openlock);
                        if (!error) {
                                /* stuff the delegation state in the node */
                                lck_mtx_lock(&np->n_openlock);
@@ -5330,8 +5894,9 @@ nfs4_open_reclaim_rpc(
                                np->n_dace = ace;
                                if (np->n_dlink.tqe_next == NFSNOLIST) {
                                        lck_mtx_lock(&nmp->nm_lock);
                                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);
                                                TAILQ_INSERT_TAIL(&nmp->nm_delegations, np, n_dlink);
+                                       }
                                        lck_mtx_unlock(&nmp->nm_lock);
                                }
                                lck_mtx_unlock(&np->n_openlock);
                                        lck_mtx_unlock(&nmp->nm_lock);
                                }
                                lck_mtx_unlock(&np->n_openlock);
@@ -5341,6 +5906,7 @@ nfs4_open_reclaim_rpc(
                        error = EBADRPC;
                        break;
                }
                        error = EBADRPC;
                        break;
                }
+       }
        nfsmout_if(error);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        error = nfs4_parsefattr(&nmrep, NULL, &nvattr, &fh, NULL, NULL);
        nfsmout_if(error);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        error = nfs4_parsefattr(&nmrep, NULL, &nvattr, &fh, NULL, NULL);
@@ -5355,27 +5921,31 @@ nfs4_open_reclaim_rpc(
                // 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.
                // 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");
                        NP(np, "nfs4_open_reclaim_rpc: warning: file handle mismatch");
+               }
        }
        error = nfs_loadattrcache(np, &nvattr, &xid, 1);
        nfsmout_if(error);
        }
        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;
                nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+       }
 nfsmout:
        // if (!error)
 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);
        NVATTR_CLEANUP(&nvattr);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       if (!lockerror)
+       if (!lockerror) {
                nfs_node_unlock(np);
                nfs_node_unlock(np);
+       }
        nfs_open_owner_clear_busy(noop);
        if ((delegation == NFS_OPEN_DELEGATE_READ) || (delegation == NFS_OPEN_DELEGATE_WRITE)) {
        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);
                        nfs4_delegation_return_enqueue(np);
+               }
        }
        }
-       return (error);
+       return error;
 }
 
 int
 }
 
 int
@@ -5392,12 +5962,14 @@ nfs4_open_downgrade_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
 
        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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -5406,7 +5978,7 @@ nfs4_open_downgrade_rpc(
        // PUTFH, OPEN_DOWNGRADE, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 23 * NFSX_UNSIGNED);
        // PUTFH, OPEN_DOWNGRADE, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 23 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "open_downgrd", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "open_downgrd", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -5423,11 +5995,12 @@ nfs4_open_downgrade_rpc(
        nfsm_assert(error, (numops == 0), EPROTO);
        nfsmout_if(error);
        error = nfs_request2(np, NULL, &nmreq, NFSPROC4_COMPOUND,
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -5438,12 +6011,13 @@ nfs4_open_downgrade_rpc(
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
 nfsmout:
        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_node_unlock(np);
+       }
        nfs_open_owner_clear_busy(noop);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        nfs_open_owner_clear_busy(noop);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 int
 }
 
 int
@@ -5462,12 +6036,14 @@ nfs4_close_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
 
        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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -5476,7 +6052,7 @@ nfs4_close_rpc(
        // PUTFH, CLOSE, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 23 * NFSX_UNSIGNED);
        // PUTFH, CLOSE, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 23 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "close", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "close", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -5490,10 +6066,11 @@ nfs4_close_rpc(
        nfsm_chain_build_done(error, &nmreq);
        nfsm_assert(error, (numops == 0), EPROTO);
        nfsmout_if(error);
        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;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -5504,12 +6081,13 @@ nfs4_close_rpc(
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        nfsm_chain_loadattr(error, &nmrep, np, nfsvers, &xid);
 nfsmout:
        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_node_unlock(np);
+       }
        nfs_open_owner_clear_busy(noop);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        nfs_open_owner_clear_busy(noop);
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 
 }
 
 
@@ -5583,8 +6161,9 @@ nfs4_claim_delegated_state_for_open_file(struct nfs_open_file *nofp, int flags)
        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 (!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;
                        reopen = error;
+               }
                if (!error || reopen) {
                        lck_mtx_lock(&nofp->nof_lock);
                        nofp->nof_rw += nofp->nof_d_rw;
                if (!error || reopen) {
                        lck_mtx_lock(&nofp->nof_lock);
                        nofp->nof_rw += nofp->nof_d_rw;
@@ -5597,8 +6176,9 @@ nfs4_claim_delegated_state_for_open_file(struct nfs_open_file *nofp, int flags)
                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 (!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;
                                reopen = error;
+                       }
                }
                if (!error || reopen) {
                        lck_mtx_lock(&nofp->nof_lock);
                }
                if (!error || reopen) {
                        lck_mtx_lock(&nofp->nof_lock);
@@ -5611,8 +6191,9 @@ nfs4_claim_delegated_state_for_open_file(struct nfs_open_file *nofp, int flags)
                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 (!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;
                                reopen = error;
+                       }
                }
                if (!error || reopen) {
                        lck_mtx_lock(&nofp->nof_lock);
                }
                if (!error || reopen) {
                        lck_mtx_lock(&nofp->nof_lock);
@@ -5636,58 +6217,65 @@ nfs4_claim_delegated_state_for_open_file(struct nfs_open_file *nofp, int flags)
                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",
                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);
                        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",
                        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 (!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;
                                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) */
                        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;
                                        continue;
+                               }
                                /* skip non-delegated locks */
                                /* skip non-delegated locks */
-                               if (!(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED))
+                               if (!(nflp->nfl_flags & NFS_FILE_LOCK_DELEGATED)) {
                                        continue;
                                        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",
                                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 {
                                        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;
                                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));
 
        /* 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);
                        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));
 
        /*
        NP(nofp->nof_np, "nfs delegated state claim error %d, state lost, %d", error, kauth_cred_getuid(nofp->nof_owner->noo_cred));
 
        /*
@@ -5704,8 +6292,9 @@ nfs4_claim_delegated_state_for_open_file(struct nfs_open_file *nofp, int flags)
        /* revoke all open file state */
        nfs_revoke_open_state_for_node(nofp->nof_np);
 
        /* 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.
 
 /*
  * Release all open state for the given node.
@@ -5720,12 +6309,14 @@ nfs_release_open_state_for_node(nfsnode_t np, int force)
        /* drop held locks */
        TAILQ_FOREACH_SAFE(nflp, &np->n_locks, nfl_link, nextnflp) {
                /* skip dead & blocked lock requests */
        /* 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;
                        continue;
+               }
                /* send an unlock if not a delegated lock */
                /* 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,
                        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;
                /* kill/remove the lock */
                lck_mtx_lock(&np->n_openlock);
                nflp->nfl_flags |= NFS_FILE_LOCK_DEAD;
@@ -5747,15 +6338,20 @@ nfs_release_open_state_for_node(nfsnode_t np, int force)
 
        /* drop all opens */
        TAILQ_FOREACH(nofp, &np->n_opens, nof_link) {
 
        /* 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;
                        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;
                /* 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);
                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);
                        nfs4_close_rpc(np, nofp, NULL, nofp->nof_owner->noo_cred, R_RECOVER);
+               }
+#endif
        }
 
        lck_mtx_unlock(&np->n_openlock);
        }
 
        lck_mtx_unlock(&np->n_openlock);
@@ -5773,8 +6369,7 @@ nfs_revoke_open_state_for_node(nfsnode_t np)
 
        /* mark node as needing to be revoked */
        nfs_node_lock_force(np);
 
        /* 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;
                NP(np, "nfs_revoke_open_state_for_node(): already revoked");
                nfs_node_unlock(np);
                return;
@@ -5794,6 +6389,7 @@ nfs_revoke_open_state_for_node(nfsnode_t np)
        }
 }
 
        }
 }
 
+#if CONFIG_NFS4
 /*
  * Claim the delegated open combinations that each of this node's open files hold.
  */
 /*
  * Claim the delegated open combinations that each of this node's open files hold.
  */
@@ -5810,19 +6406,21 @@ restart:
        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 &&
        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;
                        continue;
+               }
                lck_mtx_unlock(&np->n_openlock);
                error = nfs4_claim_delegated_state_for_open_file(nofp, flags);
                lck_mtx_lock(&np->n_openlock);
                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;
                        break;
+               }
                goto restart;
        }
 
        lck_mtx_unlock(&np->n_openlock);
 
                goto restart;
        }
 
        lck_mtx_unlock(&np->n_openlock);
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -5836,16 +6434,18 @@ nfs4_delegation_return_enqueue(nfsnode_t np)
        struct nfsmount *nmp;
 
        nmp = NFSTONMP(np);
        struct nfsmount *nmp;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
+       if (nfs_mount_gone(nmp)) {
                return;
                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);
 
        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);
                TAILQ_INSERT_TAIL(&nmp->nm_dreturnq, np, n_dreturn);
+       }
        nfs_mount_sock_thread_wake(nmp);
        lck_mtx_unlock(&nmp->nm_lock);
 }
        nfs_mount_sock_thread_wake(nmp);
        lck_mtx_unlock(&nmp->nm_lock);
 }
@@ -5862,21 +6462,24 @@ nfs4_delegation_return(nfsnode_t np, int flags, thread_t thd, kauth_cred_t cred)
        int error;
 
        nmp = NFSTONMP(np);
        int error;
 
        nmp = NFSTONMP(np);
-       if (!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);
 
        /* 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 */
        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;
                goto out;
+       }
 
        /* claim any delegated state */
 
        /* 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;
                goto out;
+       }
 
        /* return the delegation */
        lck_mtx_lock(&np->n_openlock);
 
        /* return the delegation */
        lck_mtx_lock(&np->n_openlock);
@@ -5907,13 +6510,14 @@ out:
        }
        lck_mtx_unlock(&nmp->nm_lock);
        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);
        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);
                        nfs_need_reconnect(nmp);
+               }
                if (nfs_mount_state_error_should_restart(error)) {
                        /* make sure recovery happens */
                        lck_mtx_lock(&nmp->nm_lock);
                if (nfs_mount_state_error_should_restart(error)) {
                        /* make sure recovery happens */
                        lck_mtx_lock(&nmp->nm_lock);
@@ -5924,7 +6528,7 @@ out:
 
        nfs_open_state_clear_busy(np);
 
 
        nfs_open_state_clear_busy(np);
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -5945,7 +6549,7 @@ nfs4_delegreturn_rpc(struct nfsmount *nmp, u_char *fhp, int fhlen, struct nfs_st
        // PUTFH, DELEGRETURN
        numops = 2;
        nfsm_chain_build_alloc_init(error, &nmreq, 16 * NFSX_UNSIGNED);
        // PUTFH, DELEGRETURN
        numops = 2;
        nfsm_chain_build_alloc_init(error, &nmreq, 16 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "delegreturn", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "delegreturn", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nmp->nm_vers, fhp, fhlen);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nmp->nm_vers, fhp, fhlen);
@@ -5963,9 +6567,9 @@ nfs4_delegreturn_rpc(struct nfsmount *nmp, u_char *fhp, int fhlen, struct nfs_st
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 }
-
+#endif /* CONFIG_NFS4 */
 
 /*
  * NFS read call.
 
 /*
  * NFS read call.
@@ -5977,12 +6581,12 @@ nfsmout:
 int
 nfs_vnop_read(
        struct vnop_read_args /* {
 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;
 {
        vnode_t vp = ap->a_vp;
        vfs_context_t ctx = ap->a_context;
@@ -5992,74 +6596,122 @@ nfs_vnop_read(
        struct nfs_open_file *nofp;
        int error;
 
        struct nfs_open_file *nofp;
        int error;
 
-       if (vnode_vtype(ap->a_vp) != VREG)
-               return (EPERM);
+       if (vnode_vtype(ap->a_vp) != VREG) {
+               return (vnode_vtype(vp) == VDIR) ? EISDIR : EPERM;
+       }
 
        np = VTONFS(vp);
        nmp = NFSTONMP(np);
 
        np = VTONFS(vp);
        nmp = NFSTONMP(np);
-       if (!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);
 
        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;
        }
 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 && (nofp->nof_flags & NFS_OPEN_FILE_REOPEN)) {
                error = nfs4_reopen(nofp, vfs_context_thread(ctx));
                nofp = NULL;
-               if (!error)
+               if (!error) {
                        goto restart;
                        goto restart;
+               }
        }
        }
+#endif
        if (error) {
                nfs_open_owner_rele(noop);
        if (error) {
                nfs_open_owner_rele(noop);
-               return (error);
+               return error;
        }
        }
-       if (!nofp->nof_access) {
-               /* we don't have the file open, so open it for read access */
-               error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
-               if (error) {
+       /*
+        * Since the read path is a hot path, if we already have
+        * read access, lets go and try and do the read, without
+        * busying the mount and open file node for this open owner.
+        *
+        * N.B. This is inherently racy w.r.t. an execve using
+        * an already open file, in that the read at the end of
+        * this routine will be racing with a potential close.
+        * The code below ultimately has the same problem. In practice
+        * this does not seem to be an issue.
+        */
+       if (nofp->nof_access & NFS_OPEN_SHARE_ACCESS_READ) {
+               nfs_open_owner_rele(noop);
+               goto do_read;
+       }
+       error = nfs_mount_state_in_use_start(nmp, vfs_context_thread(ctx));
+       if (error) {
+               nfs_open_owner_rele(noop);
+               return error;
+       }
+       /*
+        * If we don't have a file already open with the access we need (read) then
+        * we need to open one. Otherwise we just co-opt an open. We might not already
+        * have access because we're trying to read the first page of the
+        * file for execve.
+        */
+       error = nfs_open_file_set_busy(nofp, vfs_context_thread(ctx));
+       if (error) {
+               nfs_mount_state_in_use_end(nmp, 0);
+               nfs_open_owner_rele(noop);
+               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)));
+               }
+               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);
                        nfs_open_owner_rele(noop);
-                       return (error);
+                       return EPERM;
                }
                if (np->n_flag & NREVOKE) {
                        error = EIO;
                }
                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);
                        nfs_mount_state_in_use_end(nmp, 0);
                        nfs_open_owner_rele(noop);
-                       return (error);
+                       return error;
                }
                }
-               error = nfs_open_file_set_busy(nofp, vfs_context_thread(ctx));
-               if (error)
-                       nofp = NULL;
-               if (!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 {
-                               error = nfs4_open(np, nofp, NFS_OPEN_SHARE_ACCESS_READ, NFS_OPEN_SHARE_DENY_NONE, ctx);
-                       }
+               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);
+               }
+#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;
                        nofp->nof_flags |= NFS_OPEN_FILE_NEEDCLOSE;
-               if (nofp)
-                       nfs_open_file_clear_busy(nofp);
-               if (nfs_mount_state_in_use_end(nmp, error)) {
-                       nofp = NULL;
-                       goto restart;
                }
        }
                }
        }
+       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);
        nfs_open_owner_rele(noop);
-       if (error)
-               return (error);
-       return (nfs_bioread(VTONFS(ap->a_vp), ap->a_uio, ap->a_ioflag, ap->a_context));
+       if (error) {
+               return error;
+       }
+do_read:
+       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
 /*
  * Note: the NFSv4 CREATE RPC is for everything EXCEPT regular files.
  * Files are created using the NFSv4 OPEN RPC.  So we must open the
@@ -6068,13 +6720,13 @@ restart:
 int
 nfs4_vnop_create(
        struct vnop_create_args /* {
 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;
 {
        vfs_context_t ctx = ap->a_context;
        struct componentname *cnp = ap->a_cnp;
@@ -6088,21 +6740,24 @@ nfs4_vnop_create(
        struct nfs_open_file *newnofp = NULL, *nofp = NULL;
 
        nmp = VTONMP(dvp);
        struct nfs_open_file *newnofp = NULL, *nofp = NULL;
 
        nmp = VTONMP(dvp);
-       if (!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);
                nfs_avoid_needless_id_setting_on_create(VTONFS(dvp), vap, ctx);
+       }
 
        noop = nfs_open_owner_find(nmp, vfs_context_ucred(ctx), 1);
 
        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);
 
 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 */
        }
 
        /* grab a provisional, nodeless open file */
@@ -6117,14 +6772,17 @@ restart:
                error = nfs4_reopen(newnofp, vfs_context_thread(ctx));
                nfs_open_file_destroy(newnofp);
                newnofp = NULL;
                error = nfs4_reopen(newnofp, vfs_context_thread(ctx));
                nfs_open_file_destroy(newnofp);
                newnofp = NULL;
-               if (!error)
+               if (!error) {
                        goto restart;
                        goto restart;
+               }
        }
        }
-       if (!error)
+       if (!error) {
                error = nfs_open_file_set_busy(newnofp, vfs_context_thread(ctx));
                error = nfs_open_file_set_busy(newnofp, vfs_context_thread(ctx));
+       }
        if (error) {
        if (error) {
-               if (newnofp)
+               if (newnofp) {
                        nfs_open_file_destroy(newnofp);
                        nfs_open_file_destroy(newnofp);
+               }
                newnofp = NULL;
                goto out;
        }
                newnofp = NULL;
                goto out;
        }
@@ -6164,8 +6822,9 @@ restart:
                                        VATTR_INIT(&vattr);
                                        VATTR_SET(&vattr, va_mode, vap->va_mode);
                                        nfs4_setattr_rpc(np, &vattr, ctx);
                                        VATTR_INIT(&vattr);
                                        VATTR_SET(&vattr, va_mode, vap->va_mode);
                                        nfs4_setattr_rpc(np, &vattr, ctx);
-                                       if (!error2)
+                                       if (!error2) {
                                                error = 0;
                                                error = 0;
+                                       }
                                }
                        }
                        if (error) {
                                }
                        }
                        if (error) {
@@ -6206,8 +6865,9 @@ restart:
                busyerror = nfs_open_file_set_busy(nofp, NULL);
                nfs_open_file_add_open(nofp, accessMode, denyMode, 0);
                nofp->nof_stateid = newnofp->nof_stateid;
                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;
                        nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+               }
                nfs_open_file_clear_busy(newnofp);
                nfs_open_file_destroy(newnofp);
        }
                nfs_open_file_clear_busy(newnofp);
                nfs_open_file_destroy(newnofp);
        }
@@ -6216,16 +6876,18 @@ restart:
        nofp->nof_flags |= NFS_OPEN_FILE_CREATE;
        nofp->nof_creator = current_thread();
 out:
        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);
                nfs_open_file_clear_busy(nofp);
+       }
        if (nfs_mount_state_in_use_end(nmp, error)) {
                nofp = newnofp = NULL;
                busyerror = 0;
                goto restart;
        }
        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);
                nfs_open_owner_rele(noop);
-       return (error);
+       }
+       return error;
 }
 
 /*
 }
 
 /*
@@ -6258,12 +6920,14 @@ nfs4_create_rpc(
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(dnp);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(dnp);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        namedattrs = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR);
        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;
 
 
        sd.specdata1 = sd.specdata2 = 0;
 
@@ -6274,8 +6938,9 @@ nfs4_create_rpc(
        case NFBLK:
        case NFCHR:
                tag = "mknod";
        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;
                sd.specdata1 = major(vap->va_rdev);
                sd.specdata2 = minor(vap->va_rdev);
                break;
@@ -6287,14 +6952,15 @@ nfs4_create_rpc(
                tag = "mkdir";
                break;
        default:
                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));
        }
 
        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);
                nfs_dulookup_init(&dul, dnp, cnp->cn_nameptr, cnp->cn_namelen, ctx);
+       }
 
        NFSREQ_SECINFO_SET(&si, dnp, NULL, 0, NULL, 0);
        NVATTR_INIT(&nvattr);
 
        NFSREQ_SECINFO_SET(&si, dnp, NULL, 0, NULL, 0);
        NVATTR_INIT(&nvattr);
@@ -6304,7 +6970,7 @@ nfs4_create_rpc(
        // PUTFH, SAVEFH, CREATE, GETATTR(FH), RESTOREFH, GETATTR
        numops = 6;
        nfsm_chain_build_alloc_init(error, &nmreq, 66 * NFSX_UNSIGNED);
        // PUTFH, SAVEFH, CREATE, GETATTR(FH), RESTOREFH, GETATTR
        numops = 6;
        nfsm_chain_build_alloc_init(error, &nmreq, 66 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, tag, numops);
+       nfsm_chain_add_compound_header(error, &nmreq, tag, nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, dnp->n_fhp, dnp->n_fhsize);
@@ -6336,15 +7002,17 @@ nfs4_create_rpc(
        nfsmout_if(error);
 
        error = nfs_request_async(dnp, NULL, &nmreq, NFSPROC4_COMPOUND,
        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 (!error) {
-               if (!namedattrs)
+               if (!namedattrs) {
                        nfs_dulookup_start(&dul, dnp, ctx);
                        nfs_dulookup_start(&dul, dnp, ctx);
+               }
                error = nfs_request_async_finish(req, &nmrep, &xid, &status);
        }
 
                error = nfs_request_async_finish(req, &nmrep, &xid, &status);
        }
 
-       if ((lockerror = nfs_node_lock(dnp)))
+       if ((lockerror = nfs_node_lock(dnp))) {
                error = lockerror;
                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_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
@@ -6373,8 +7041,9 @@ nfs4_create_rpc(
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        savedxid = xid;
        nfsm_chain_loadattr(error, &nmrep, dnp, nfsvers, &xid);
        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);
                NATTRINVALIDATE(dnp);
+       }
 
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
 
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
@@ -6395,13 +7064,15 @@ nfsmout:
                /* 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);
                /* 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);
                        newvp = NFSTOV(np);
+               }
        }
        NVATTR_CLEANUP(&nvattr);
 
        }
        NVATTR_CLEANUP(&nvattr);
 
-       if (!namedattrs)
+       if (!namedattrs) {
                nfs_dulookup_finish(&dul, dnp, ctx);
                nfs_dulookup_finish(&dul, dnp, ctx);
+       }
 
        /*
         * Kludge: Map EEXIST => 0 assuming that you have a reply to a retry
 
        /*
         * Kludge: Map EEXIST => 0 assuming that you have a reply to a retry
@@ -6411,12 +7082,14 @@ nfsmout:
                error = nfs_lookitup(dnp, cnp->cn_nameptr, cnp->cn_namelen, ctx, &np);
                if (!error) {
                        newvp = NFSTOV(np);
                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;
                                error = EEXIST;
+                       }
                }
        }
                }
        }
-       if (!busyerror)
+       if (!busyerror) {
                nfs_node_clear_busy(dnp);
                nfs_node_clear_busy(dnp);
+       }
        if (error) {
                if (newvp) {
                        nfs_node_unlock(np);
        if (error) {
                if (newvp) {
                        nfs_node_unlock(np);
@@ -6426,30 +7099,32 @@ nfsmout:
                nfs_node_unlock(np);
                *npp = np;
        }
                nfs_node_unlock(np);
                *npp = np;
        }
-       return (error);
+       return error;
 }
 
 int
 nfs4_vnop_mknod(
        struct vnop_mknod_args /* {
 }
 
 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);
 {
        nfsnode_t np = NULL;
        struct nfsmount *nmp;
        int error;
 
        nmp = VTONMP(ap->a_dvp);
-       if (!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:
        switch (ap->a_vap->va_type) {
        case VBLK:
        case VCHR:
@@ -6457,68 +7132,71 @@ nfs4_vnop_mknod(
        case VSOCK:
                break;
        default:
        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,
        }
 
        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);
                *ap->a_vpp = NFSTOV(np);
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_mkdir(
        struct vnop_mkdir_args /* {
 }
 
 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,
 {
        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);
                *ap->a_vpp = NFSTOV(np);
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_symlink(
        struct vnop_symlink_args /* {
 }
 
 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,
 {
        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);
                *ap->a_vpp = NFSTOV(np);
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_link(
        struct vnop_link_args /* {
 }
 
 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;
 {
        vfs_context_t ctx = ap->a_context;
        vnode_t vp = ap->a_vp;
@@ -6533,17 +7211,21 @@ nfs4_vnop_link(
        struct nfsm_chain nmreq, nmrep;
        struct nfsreq_secinfo_args si;
 
        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);
 
        nmp = VTONMP(vp);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        nfsvers = nmp->nm_vers;
        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
 
        /*
         * Push all writes to the server, so that the attribute cache
@@ -6552,8 +7234,9 @@ nfs4_vnop_link(
         */
        nfs_flush(np, MNT_WAIT, vfs_context_thread(ctx), V_IGNORE_WRITEERR);
 
         */
        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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        nfsm_chain_null(&nmreq);
@@ -6562,7 +7245,7 @@ nfs4_vnop_link(
        // PUTFH(SOURCE), SAVEFH, PUTFH(DIR), LINK, GETATTR(DIR), RESTOREFH, GETATTR
        numops = 7;
        nfsm_chain_build_alloc_init(error, &nmreq, 29 * NFSX_UNSIGNED + cnp->cn_namelen);
        // PUTFH(SOURCE), SAVEFH, PUTFH(DIR), LINK, GETATTR(DIR), RESTOREFH, GETATTR
        numops = 7;
        nfsm_chain_build_alloc_init(error, &nmreq, 29 * NFSX_UNSIGNED + cnp->cn_namelen);
-       nfsm_chain_add_compound_header(error, &nmreq, "link", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "link", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nfsvers, np->n_fhp, np->n_fhsize);
@@ -6602,42 +7285,47 @@ nfs4_vnop_link(
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        savedxid = xid;
        nfsm_chain_loadattr(error, &nmrep, tdnp, nfsvers, &xid);
        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);
                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);
        /* 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);
                NATTRINVALIDATE(np);
+       }
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
 nfsmout:
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       if (!lockerror)
+       if (!lockerror) {
                tdnp->n_flag |= NMODIFIED;
                tdnp->n_flag |= NMODIFIED;
+       }
        /* Kludge: Map EEXIST => 0 assuming that it is a reply to a retry. */
        /* Kludge: Map EEXIST => 0 assuming that it is a reply to a retry. */
-       if (error == EEXIST)
+       if (error == EEXIST) {
                error = 0;
                error = 0;
+       }
        if (!error && (tdnp->n_flag & NNEGNCENTRIES)) {
                tdnp->n_flag &= ~NNEGNCENTRIES;
                cache_purge_negatives(tdvp);
        }
        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_unlock2(tdnp, np);
+       }
        nfs_node_clear_busy2(tdnp, np);
        nfs_node_clear_busy2(tdnp, np);
-       return (error);
+       return error;
 }
 
 int
 nfs4_vnop_rmdir(
        struct vnop_rmdir_args /* {
 }
 
 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;
 {
        vfs_context_t ctx = ap->a_context;
        vnode_t vp = ap->a_vp;
@@ -6649,16 +7337,19 @@ nfs4_vnop_rmdir(
        nfsnode_t dnp = VTONFS(dvp);
        struct nfs_dulookup dul;
 
        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);
 
        nmp = NFSTONMP(dnp);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        namedattrs = (nmp->nm_fsattr.nfsa_flags & NFS_FSFLAG_NAMED_ATTR);
 
        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);
 
        if (!namedattrs) {
                nfs_dulookup_init(&dul, dnp, cnp->cn_nameptr, cnp->cn_namelen, ctx);
@@ -6666,20 +7357,22 @@ nfs4_vnop_rmdir(
        }
 
        error = nfs4_remove_rpc(dnp, cnp->cn_nameptr, cnp->cn_namelen,
        }
 
        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);
 
        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_dulookup_finish(&dul, dnp, ctx);
+       }
        nfs_node_clear_busy2(dnp, np);
 
        /*
         * Kludge: Map ENOENT => 0 assuming that you have a reply to a retry.
         */
        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;
                error = 0;
+       }
        if (!error) {
                /*
                 * remove nfsnode from hash now so we can't accidentally find it
        if (!error) {
                /*
                 * remove nfsnode from hash now so we can't accidentally find it
@@ -6694,7 +7387,7 @@ nfs4_vnop_rmdir(
                }
                lck_mtx_unlock(nfs_node_hash_mutex);
        }
                }
                lck_mtx_unlock(nfs_node_hash_mutex);
        }
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -6737,10 +7430,12 @@ nfs4_named_attr_dir_get(nfsnode_t np, int fetch, vfs_context_t ctx)
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
        struct nfsreq_secinfo_args si;
 
        nmp = NFSTONMP(np);
-       if (!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);
 
        NFSREQ_SECINFO_SET(&si, np, NULL, 0, NULL, 0);
        NVATTR_INIT(&nvattr);
@@ -6754,10 +7449,11 @@ nfs4_named_attr_dir_get(nfsnode_t np, int fetch, vfs_context_t ctx)
 
        if (np->n_attrdirfh) {
                // XXX can't set parent correctly (to np) yet
 
        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;
                        goto nfsmout;
+               }
        }
        if (!fetch) {
                error = ENOENT;
        }
        if (!fetch) {
                error = ENOENT;
@@ -6767,7 +7463,7 @@ nfs4_named_attr_dir_get(nfsnode_t np, int fetch, vfs_context_t ctx)
        // PUTFH, OPENATTR, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 22 * NFSX_UNSIGNED);
        // PUTFH, OPENATTR, GETATTR
        numops = 3;
        nfsm_chain_build_alloc_init(error, &nmreq, 22 * NFSX_UNSIGNED);
-       nfsm_chain_add_compound_header(error, &nmreq, "openattr", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "openattr", nmp->nm_minor_vers, numops);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nmp->nm_vers, np->n_fhp, np->n_fhsize);
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        nfsm_chain_add_fh(error, &nmreq, nmp->nm_vers, np->n_fhp, np->n_fhsize);
@@ -6779,14 +7475,15 @@ nfs4_named_attr_dir_get(nfsnode_t np, int fetch, vfs_context_t ctx)
        NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
        NFS_BITMAP_SET(bitmap, NFS_FATTR_FILEHANDLE);
        nfsm_chain_add_bitmap_masked(error, &nmreq, bitmap,
        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,
        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);
                error = nfs_request_async_finish(req, &nmrep, &xid, &status);
+       }
 
        nfsm_chain_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
 
        nfsm_chain_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
@@ -6802,9 +7499,10 @@ nfs4_named_attr_dir_get(nfsnode_t np, int fetch, vfs_context_t ctx)
        }
        if (!np->n_attrdirfh || (*np->n_attrdirfh != fh.fh_len)) {
                /* (re)allocate attrdir fh buffer */
        }
        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);
                        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;
        }
        if (!np->n_attrdirfh) {
                error = ENOMEM;
@@ -6812,7 +7510,7 @@ nfs4_named_attr_dir_get(nfsnode_t np, int fetch, vfs_context_t ctx)
        }
        /* cache the attrdir fh in the node */
        *np->n_attrdirfh = fh.fh_len;
        }
        /* 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);
        /* 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);
@@ -6823,15 +7521,18 @@ nfsmout:
 
        if (adnp) {
                /* sanity check that this node is an attribute directory */
 
        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;
                        error = EINVAL;
-               if (!(adnp->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR))
+               }
+               if (!(adnp->n_vattr.nva_flags & NFS_FFLAG_IS_ATTR)) {
                        error = EINVAL;
                        error = EINVAL;
+               }
                nfs_node_unlock(adnp);
                nfs_node_unlock(adnp);
-               if (error)
+               if (error) {
                        vnode_put(NFSTOV(adnp));
                        vnode_put(NFSTOV(adnp));
+               }
        }
        }
-       return (error ? NULL : adnp);
+       return error ? NULL : adnp;
 }
 
 /*
 }
 
 /*
@@ -6855,10 +7556,10 @@ nfsmout:
  * the lookup/open, we lock both the node and the attribute directory node.
  */
 
  * 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(
 
 int
 nfs4_named_attr_get(
@@ -6905,8 +7606,9 @@ nfs4_named_attr_get(
        slen = sizeof(sbuf);
 
        nmp = NFSTONMP(np);
        slen = sizeof(sbuf);
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
        NVATTR_INIT(&nvattr);
        negnamecache = !NMFLAG(nmp, NONEGNAMECACHE);
        thd = vfs_context_thread(ctx);
        NVATTR_INIT(&nvattr);
        negnamecache = !NMFLAG(nmp, NONEGNAMECACHE);
        thd = vfs_context_thread(ctx);
@@ -6918,11 +7620,13 @@ nfs4_named_attr_get(
 
        if (!create) {
                error = nfs_getattr(np, &nvattr, ctx, NGA_CACHED);
 
        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) &&
                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);
        } 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);
@@ -6936,16 +7640,18 @@ nfs4_named_attr_get(
                 * and set NFS_OPEN_FILE_CREATE.
                 */
                denyMode = NFS_OPEN_SHARE_DENY_NONE;
                 * 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 */
                        prefetch = 0;  /* no sense prefetching data that can't be there */
-
+               }
                noop = nfs_open_owner_find(nmp, vfs_context_ucred(ctx), 1);
                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);
 
        adnp = nfs4_named_attr_dir_get(np, 0, ctx);
        hadattrdir = (adnp != NULL);
@@ -6960,8 +7666,9 @@ nfs4_named_attr_get(
        nfsm_chain_null(&nmrep);
 
        if (hadattrdir) {
        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;
                        goto nfsmout;
+               }
                /* nfs_getattr() will check changed and purge caches */
                error = nfs_getattr(adnp, NULL, ctx, NGA_CACHED);
                nfsmout_if(error);
                /* nfs_getattr() will check changed and purge caches */
                error = nfs_getattr(adnp, NULL, ctx, NGA_CACHED);
                nfsmout_if(error);
@@ -6979,14 +7686,16 @@ nfs4_named_attr_get(
                                *anpp = anp;
                                error = -1;
                        }
                                *anpp = anp;
                                error = -1;
                        }
-                       if (error != -1) /* cache miss */
+                       if (error != -1) { /* cache miss */
                                break;
                                break;
-                       /* FALLTHROUGH */
+                       }
+               /* FALLTHROUGH */
                case -1:
                        /* cache hit, not really an error */
                case -1:
                        /* cache hit, not really an error */
-                       OSAddAtomic(1, &nfsstats.lookupcache_hits);
-                       if (!anp && avp)
+                       OSAddAtomic64(1, &nfsstats.lookupcache_hits);
+                       if (!anp && avp) {
                                *anpp = anp = VTONFS(avp);
                                *anpp = anp = VTONFS(avp);
+                       }
 
                        nfs_node_clear_busy(adnp);
                        adbusyerror = ENOENT;
 
                        nfs_node_clear_busy(adnp);
                        adbusyerror = ENOENT;
@@ -6999,7 +7708,7 @@ nfs4_named_attr_get(
 
                        /* compute actual success/failure based on accessibility */
                        error = nfs_vnop_access(&naa);
 
                        /* 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) {
                default:
                        /* we either found it, or hit an error */
                        if (!error && guarded) {
@@ -7009,8 +7718,9 @@ nfs4_named_attr_get(
                                *anpp = anp = NULL;
                        }
                        /* we're done if error or we don't need to open */
                                *anpp = anp = NULL;
                        }
                        /* we're done if error or we don't need to open */
-                       if (error || !open)
+                       if (error || !open) {
                                goto nfsmout;
                                goto nfsmout;
+                       }
                        /* no error and we need to open... */
                }
        }
                        /* no error and we need to open... */
                }
        }
@@ -7036,14 +7746,17 @@ restart:
                        error = nfs4_reopen(newnofp, vfs_context_thread(ctx));
                        nfs_open_file_destroy(newnofp);
                        newnofp = NULL;
                        error = nfs4_reopen(newnofp, vfs_context_thread(ctx));
                        nfs_open_file_destroy(newnofp);
                        newnofp = NULL;
-                       if (!error)
+                       if (!error) {
                                goto restart;
                                goto restart;
+                       }
                }
                }
-               if (!error)
+               if (!error) {
                        error = nfs_open_file_set_busy(newnofp, vfs_context_thread(ctx));
                        error = nfs_open_file_set_busy(newnofp, vfs_context_thread(ctx));
+               }
                if (error) {
                if (error) {
-                       if (newnofp)
+                       if (newnofp) {
                                nfs_open_file_destroy(newnofp);
                                nfs_open_file_destroy(newnofp);
+                       }
                        newnofp = NULL;
                        goto nfsmout;
                }
                        newnofp = NULL;
                        goto nfsmout;
                }
@@ -7058,8 +7771,9 @@ restart:
                                nofp = newnofp;
                                nofpbusyerror = 0;
                                newnofp = NULL;
                                nofp = newnofp;
                                nofpbusyerror = 0;
                                newnofp = NULL;
-                               if (nofpp)
+                               if (nofpp) {
                                        *nofpp = nofp;
                                        *nofpp = nofp;
+                               }
                        }
                        goto nfsmout;
                }
                        }
                        goto nfsmout;
                }
@@ -7078,8 +7792,9 @@ restart:
 
        if (open) {
                /* need to mark the open owner busy during the RPC */
 
        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;
                        goto nfsmout;
+               }
                noopbusy = 1;
        }
 
                noopbusy = 1;
        }
 
@@ -7092,12 +7807,14 @@ restart:
         * At a minimum we're sending: PUTFH, LOOKUP/OPEN, GETATTR, PUTFH, GETATTR
         */
        numops = 5;
         * 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_build_alloc_init(error, &nmreq, 64 * NFSX_UNSIGNED + cnp->cn_namelen);
-       nfsm_chain_add_compound_header(error, &nmreq, "getnamedattr", numops);
+       nfsm_chain_add_compound_header(error, &nmreq, "getnamedattr", nmp->nm_minor_vers, numops);
        if (hadattrdir) {
                numops--;
                nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
        if (hadattrdir) {
                numops--;
                nfsm_chain_add_32(error, &nmreq, NFS_OP_PUTFH);
@@ -7114,7 +7831,7 @@ restart:
                NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
                NFS_BITMAP_SET(bitmap, NFS_FATTR_FILEHANDLE);
                nfsm_chain_add_bitmap_masked(error, &nmreq, bitmap,
                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 (open) {
                numops--;
@@ -7129,8 +7846,9 @@ restart:
                if (create) {
                        nfsm_chain_add_32(error, &nmreq, guarded);
                        VATTR_INIT(&vattr);
                if (create) {
                        nfsm_chain_add_32(error, &nmreq, guarded);
                        VATTR_INIT(&vattr);
-                       if (truncate)
+                       if (truncate) {
                                VATTR_SET(&vattr, va_data_size, 0);
                                VATTR_SET(&vattr, va_data_size, 0);
+                       }
                        nfsm_chain_add_fattr4(error, &nmreq, &vattr, nmp);
                }
                nfsm_chain_add_32(error, &nmreq, NFS_CLAIM_NULL);
                        nfsm_chain_add_fattr4(error, &nmreq, &vattr, nmp);
                }
                nfsm_chain_add_32(error, &nmreq, NFS_CLAIM_NULL);
@@ -7145,7 +7863,7 @@ restart:
        NFS_COPY_ATTRIBUTES(nfs_getattr_bitmap, bitmap);
        NFS_BITMAP_SET(bitmap, NFS_FATTR_FILEHANDLE);
        nfsm_chain_add_bitmap_masked(error, &nmreq, bitmap,
        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);
        if (prefetch) {
                numops--;
                nfsm_chain_add_32(error, &nmreq, NFS_OP_SAVEFH);
@@ -7165,7 +7883,7 @@ restart:
        numops--;
        nfsm_chain_add_32(error, &nmreq, NFS_OP_GETATTR);
        nfsm_chain_add_bitmap_masked(error, &nmreq, nfs_getattr_bitmap,
        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);
        if (prefetch) {
                numops--;
                nfsm_chain_add_32(error, &nmreq, NFS_OP_RESTOREFH);
@@ -7184,12 +7902,14 @@ restart:
        nfsm_assert(error, (numops == 0), EPROTO);
        nfsmout_if(error);
        error = nfs_request_async(hadattrdir ? adnp : np, NULL, &nmreq, NFSPROC4_COMPOUND,
        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);
                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;
                error = adlockerror;
+       }
        savedxid = xid;
        nfsm_chain_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
        savedxid = xid;
        nfsm_chain_skip_tag(error, &nmrep);
        nfsm_chain_get_32(error, &nmrep, numops);
@@ -7203,14 +7923,15 @@ restart:
                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 (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);
                                        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;
                        }
                        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));
                                /* create busied node for attrdir */
                                struct componentname cn;
                                bzero(&cn, sizeof(cn));
@@ -7241,7 +7962,7 @@ restart:
                bmlen = NFS_ATTR_BITMAP_LEN;
                nfsm_chain_get_bitmap(error, &nmrep, bitmap, bmlen);
                nfsm_chain_get_32(error, &nmrep, delegation);
                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;
                        switch (delegation) {
                        case NFS_OPEN_DELEGATE_NONE:
                                break;
@@ -7249,8 +7970,9 @@ restart:
                        case NFS_OPEN_DELEGATE_WRITE:
                                nfsm_chain_get_stateid(error, &nmrep, &dstateid);
                                nfsm_chain_get_32(error, &nmrep, recall);
                        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);
                                        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);
                                /* 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);
@@ -7261,30 +7983,36 @@ restart:
                                ace.ace_flags |= nfs4_ace_nfsflags_to_vfsflags(ace_flags);
                                ace.ace_rights = nfs4_ace_nfsmask_to_vfsrights(ace_mask);
                                if (!error && (len >= slen)) {
                                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;
                                                ace.ace_flags = 0;
+                                       }
                                }
                                }
-                               if (s)
+                               if (s) {
                                        nfsm_chain_get_opaque(error, &nmrep, len, s);
                                        nfsm_chain_get_opaque(error, &nmrep, len, s);
-                               else
+                               } else {
                                        nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
                                        nfsm_chain_adv(error, &nmrep, nfsm_rndup(len));
+                               }
                                if (!error && s) {
                                        s[len] = '\0';
                                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;
                                                ace.ace_flags = 0;
+                                       }
                                }
                                }
-                               if (error || !s)
+                               if (error || !s) {
                                        ace.ace_flags = 0;
                                        ace.ace_flags = 0;
-                               if (s && (s != sbuf))
+                               }
+                               if (s && (s != sbuf)) {
                                        FREE(s, M_TEMP);
                                        FREE(s, M_TEMP);
+                               }
                                break;
                        default:
                                error = EBADRPC;
                                break;
                        }
                                break;
                        default:
                                error = EBADRPC;
                                break;
                        }
+               }
                /* At this point if we have no error, the object was created/opened. */
                open_error = error;
        } else {
                /* At this point if we have no error, the object was created/opened. */
                open_error = error;
        } else {
@@ -7298,11 +8026,13 @@ restart:
                error = EIO;
                goto nfsmout;
        }
                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_SAVEFH);
+       }
        nfsm_chain_op_check(error, &nmrep, NFS_OP_PUTFH);
        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_OPENATTR);
+       }
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        nfsmout_if(error);
        xid = savedxid;
        nfsm_chain_op_check(error, &nmrep, NFS_OP_GETATTR);
        nfsmout_if(error);
        xid = savedxid;
@@ -7310,8 +8040,9 @@ restart:
        nfsmout_if(error);
 
        if (open) {
        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;
                        newnofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+               }
                if (rflags & NFS_OPEN_RESULT_CONFIRM) {
                        if (adnp) {
                                nfs_node_unlock(adnp);
                if (rflags & NFS_OPEN_RESULT_CONFIRM) {
                        if (adnp) {
                                nfs_node_unlock(adnp);
@@ -7321,8 +8052,9 @@ restart:
                        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;
                        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;
                                error = adlockerror;
+                       }
                }
        }
 
                }
        }
 
@@ -7375,8 +8107,9 @@ nfsmout:
                                nofpbusyerror = nfs_open_file_set_busy(nofp, NULL);
                                nfs_open_file_add_open(nofp, accessMode, denyMode, 0);
                                nofp->nof_stateid = newnofp->nof_stateid;
                                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;
                                        nofp->nof_flags |= NFS_OPEN_FILE_POSIXLOCK;
+                               }
                                nfs_open_file_clear_busy(newnofp);
                                nfs_open_file_destroy(newnofp);
                                newnofp = NULL;
                                nfs_open_file_clear_busy(newnofp);
                                nfs_open_file_destroy(newnofp);
                                newnofp = NULL;
@@ -7387,8 +8120,9 @@ nfsmout:
                                /* mark the node as holding a create-initiated open */
                                nofp->nof_flags |= NFS_OPEN_FILE_CREATE;
                                nofp->nof_creator = current_thread();
                                /* 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;
                                        *nofpp = nofp;
+                               }
                        }
                }
        }
                        }
                }
        }
@@ -7403,8 +8137,9 @@ nfsmout:
                        anp->n_dace = ace;
                        if (anp->n_dlink.tqe_next == NFSNOLIST) {
                                lck_mtx_lock(&nmp->nm_lock);
                        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);
                                        TAILQ_INSERT_TAIL(&nmp->nm_delegations, anp, n_dlink);
+                               }
                                lck_mtx_unlock(&nmp->nm_lock);
                        }
                        lck_mtx_unlock(&anp->n_openlock);
                                lck_mtx_unlock(&nmp->nm_lock);
                        }
                        lck_mtx_unlock(&anp->n_openlock);
@@ -7420,8 +8155,9 @@ nfsmout:
                                        anp->n_dace = ace;
                                        if (anp->n_dlink.tqe_next == NFSNOLIST) {
                                                lck_mtx_lock(&nmp->nm_lock);
                                        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);
                                                        TAILQ_INSERT_TAIL(&nmp->nm_delegations, anp, n_dlink);
+                                               }
                                                lck_mtx_unlock(&nmp->nm_lock);
                                        }
                                        lck_mtx_unlock(&anp->n_openlock);
                                                lck_mtx_unlock(&nmp->nm_lock);
                                        }
                                        lck_mtx_unlock(&anp->n_openlock);
@@ -7431,8 +8167,9 @@ nfsmout:
                                /* return anp's current delegation */
                                nfs4_delegation_return(anp, 0, thd, cred);
                        }
                                /* 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);
                                nfs4_delegreturn_rpc(nmp, fh.fh_data, fh.fh_len, &dstateid, 0, thd, cred);
+                       }
                }
        }
        if (open) {
                }
        }
        if (open) {
@@ -7501,15 +8238,17 @@ nfsmout:
                        retlen = MIN(retlen, rlen);
 
                        /* check if node needs size update or invalidation */
                        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);
                                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);
                        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;
                                                error = EIO;
+                                       }
                                } else {
                                        nfs_node_unlock(anp);
                                }
                                } else {
                                        nfs_node_unlock(anp);
                                }
@@ -7519,13 +8258,14 @@ nfsmout:
                        lastpg = (trunc_page_32(retlen) - 1) / PAGE_SIZE;
                        pagemask = ((1 << (lastpg + 1)) - 1);
 
                        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, <)) {
                        /* 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, <)) {
-                               OSAddAtomic(1, &nfsstats.read_bios);
-                               CLR(bp->nb_flags, (NB_DONE|NB_ASYNC));
+                               OSAddAtomic64(1, &nfsstats.read_bios);
+                               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);
                                SET(bp->nb_flags, NB_READ);
                                NFS_BUF_MAP(bp);
                                nfsm_chain_get_opaque(error, &nmrep, retlen, bp->nb_data);
@@ -7535,16 +8275,18 @@ nfsmout:
                                } else {
                                        bp->nb_offio = 0;
                                        bp->nb_endio = rlen;
                                } 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;
                                                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 (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);
                                                        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);
                                        } else if ((retlen < rlen) && !ISSET(bp->nb_flags, NB_ERROR)) {
                                                /* ugh... short read ... just invalidate for now... */
                                                SET(bp->nb_flags, NB_INVAL);
@@ -7553,8 +8295,9 @@ nfsmout:
                                nfs_buf_read_finish(bp);
                                microuptime(&anp->n_lastio);
                        }
                                nfs_buf_read_finish(bp);
                                microuptime(&anp->n_lastio);
                        }
-                       if (bp)
+                       if (bp) {
                                nfs_buf_release(bp, 1);
                                nfs_buf_release(bp, 1);
+                       }
                }
                error = 0; /* ignore any transient error in processing the prefetch */
        }
                }
                error = 0; /* ignore any transient error in processing the prefetch */
        }
@@ -7566,15 +8309,16 @@ nfsmout:
                nfs_node_clear_busy(np);
                busyerror = ENOENT;
        }
                nfs_node_clear_busy(np);
                busyerror = ENOENT;
        }
-       if (adnp)
+       if (adnp) {
                vnode_put(NFSTOV(adnp));
                vnode_put(NFSTOV(adnp));
+       }
        if (error && *anpp) {
                vnode_put(NFSTOV(*anpp));
                *anpp = NULL;
        }
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
        if (error && *anpp) {
                vnode_put(NFSTOV(*anpp));
                *anpp = NULL;
        }
        nfsm_chain_cleanup(&nmreq);
        nfsm_chain_cleanup(&nmrep);
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -7590,8 +8334,9 @@ nfs4_named_attr_remove(nfsnode_t np, nfsnode_t anp, const char *name, vfs_contex
        int error, putanp = 0;
 
        nmp = NFSTONMP(np);
        int error, putanp = 0;
 
        nmp = NFSTONMP(np);
-       if (!nmp)
-               return (ENXIO);
+       if (nfs_mount_gone(nmp)) {
+               return ENXIO;
+       }
 
        bzero(&cn, sizeof(cn));
        cn.cn_nameptr = __CAST_AWAY_QUALIFIER(name, const, char *);
 
        bzero(&cn, sizeof(cn));
        cn.cn_nameptr = __CAST_AWAY_QUALIFIER(name, const, char *);
@@ -7601,9 +8346,10 @@ nfs4_named_attr_remove(nfsnode_t np, nfsnode_t anp, const char *name, vfs_contex
 
        if (!anp) {
                error = nfs4_named_attr_get(np, &cn, NFS_OPEN_SHARE_ACCESS_NONE,
 
        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;
                        error = ENOENT;
+               }
                if (error) {
                        if (anp) {
                                vnode_put(NFSTOV(anp));
                if (error) {
                        if (anp) {
                                vnode_put(NFSTOV(anp));
@@ -7614,8 +8360,9 @@ nfs4_named_attr_remove(nfsnode_t np, nfsnode_t anp, const char *name, vfs_contex
                putanp = 1;
        }
 
                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;
                goto out;
+       }
        adnp = nfs4_named_attr_dir_get(np, 1, ctx);
        nfs_node_clear_busy(np);
        if (!adnp) {
        adnp = nfs4_named_attr_dir_get(np, 1, ctx);
        nfs_node_clear_busy(np);
        if (!adnp) {
@@ -7631,24 +8378,26 @@ nfs4_named_attr_remove(nfsnode_t np, nfsnode_t anp, const char *name, vfs_contex
        vra.a_context = ctx;
        error = nfs_vnop_remove(&vra);
 out:
        vra.a_context = ctx;
        error = nfs_vnop_remove(&vra);
 out:
-       if (adnp)
+       if (adnp) {
                vnode_put(NFSTOV(adnp));
                vnode_put(NFSTOV(adnp));
-       if (putanp)
+       }
+       if (putanp) {
                vnode_put(NFSTOV(anp));
                vnode_put(NFSTOV(anp));
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_getxattr(
        struct vnop_getxattr_args /* {
 }
 
 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;
 {
        vfs_context_t ctx = ap->a_context;
        struct nfsmount *nmp;
@@ -7658,17 +8407,21 @@ nfs4_vnop_getxattr(
        int error = 0, isrsrcfork;
 
        nmp = VTONMP(ap->a_vp);
        int error = 0, isrsrcfork;
 
        nmp = VTONMP(ap->a_vp);
-       if (!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);
        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) &&
        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 *);
 
        bzero(&cn, sizeof(cn));
        cn.cn_nameptr = __CAST_AWAY_QUALIFIER(ap->a_name, const, char *);
@@ -7680,30 +8433,33 @@ nfs4_vnop_getxattr(
        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 = (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;
                error = ENOATTR;
+       }
        if (!error) {
        if (!error) {
-               if (ap->a_uio)
+               if (ap->a_uio) {
                        error = nfs_bioread(anp, ap->a_uio, 0, ctx);
                        error = nfs_bioread(anp, ap->a_uio, 0, ctx);
-               else
+               } else {
                        *ap->a_size = anp->n_size;
                        *ap->a_size = anp->n_size;
+               }
        }
        }
-       if (anp)
+       if (anp) {
                vnode_put(NFSTOV(anp));
                vnode_put(NFSTOV(anp));
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_setxattr(
        struct vnop_setxattr_args /* {
 }
 
 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;
 {
        vfs_context_t ctx = ap->a_context;
        int options = ap->a_options;
@@ -7717,24 +8473,27 @@ nfs4_vnop_setxattr(
        uint8_t finfo[FINDERINFOSIZE];
        uint32_t *finfop;
        struct nfs_open_file *nofp = NULL;
        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);
        uio_t auio;
        struct vnop_write_args vwa;
 
        nmp = VTONMP(ap->a_vp);
-       if (!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");
 
        /* 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));
        }
 
        bzero(&cn, sizeof(cn));
@@ -7745,26 +8504,31 @@ nfs4_vnop_setxattr(
 
        isfinderinfo = (bcmp(name, XATTR_FINDERINFO_NAME, sizeof(XATTR_FINDERINFO_NAME)) == 0);
        isrsrcfork = isfinderinfo ? 0 : (bcmp(name, XATTR_RESOURCEFORK_NAME, sizeof(XATTR_RESOURCEFORK_NAME)) == 0);
 
        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);
                uio_setoffset(uio, 0);
+       }
        if (isfinderinfo) {
        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);
                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;
                /* 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 (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);
                        error = nfs4_named_attr_remove(VTONFS(ap->a_vp), anp, name, ctx);
-                       if (error == ENOENT)
+                       if (error == ENOENT) {
                                error = 0;
                                error = 0;
-                       return (error);
+                       }
+                       return error;
                }
                /* first, let's see if we get a create/replace error */
        }
                }
                /* first, let's see if we get a create/replace error */
        }
@@ -7778,19 +8542,24 @@ nfs4_vnop_setxattr(
         * that by setting the size to 0 on create/open.
         */
        flags = 0;
         * 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;
                flags |= NFS_GET_NAMED_ATTR_CREATE;
-       if (options & XATTR_CREATE)
+       }
+       if (options & XATTR_CREATE) {
                flags |= NFS_GET_NAMED_ATTR_CREATE_GUARDED;
                flags |= NFS_GET_NAMED_ATTR_CREATE_GUARDED;
-       if (!isrsrcfork)
+       }
+       if (!isrsrcfork) {
                flags |= NFS_GET_NAMED_ATTR_TRUNCATE;
                flags |= NFS_GET_NAMED_ATTR_TRUNCATE;
+       }
 
        error = nfs4_named_attr_get(VTONFS(ap->a_vp), &cn, NFS_OPEN_SHARE_ACCESS_BOTH,
 
        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;
                error = ENOATTR;
-       if (error)
+       }
+       if (error) {
                goto out;
                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;
        /* 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;
@@ -7799,8 +8568,9 @@ nfs4_vnop_setxattr(
        }
 
        /* Setting an empty FinderInfo really means remove it, skip to the close/remove */
        }
 
        /* Setting an empty FinderInfo really means remove it, skip to the close/remove */
-       if (isfinderinfo && empty)
+       if (isfinderinfo && empty) {
                goto doclose;
                goto doclose;
+       }
 
        /*
         * Write the data out and flush.
 
        /*
         * Write the data out and flush.
@@ -7821,66 +8591,75 @@ nfs4_vnop_setxattr(
        }
        if (vwa.a_uio) {
                error = nfs_vnop_write(&vwa);
        }
        if (vwa.a_uio) {
                error = nfs_vnop_write(&vwa);
-               if (!error)
+               if (!error) {
                        error = nfs_flush(anp, MNT_WAIT, vfs_context_thread(ctx), 0);
                        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);
        }
 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);
                        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);
                error = nfs4_named_attr_remove(VTONFS(ap->a_vp), anp, name, ctx);
-               if (error == ENOENT)
+               if (error == ENOENT) {
                        error = 0;
                        error = 0;
+               }
        }
        }
-       if (!error)
+       if (!error) {
                error = closeerror;
                error = closeerror;
+       }
 out:
 out:
-       if (anp)
+       if (anp) {
                vnode_put(NFSTOV(anp));
                vnode_put(NFSTOV(anp));
-       if (error == ENOENT)
+       }
+       if (error == ENOENT) {
                error = ENOATTR;
                error = ENOATTR;
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_removexattr(
        struct vnop_removexattr_args /* {
 }
 
 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;
 
 {
        struct nfsmount *nmp = VTONMP(ap->a_vp);
        int error;
 
-       if (!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);
 
        error = nfs4_named_attr_remove(VTONFS(ap->a_vp), NULL, ap->a_name, ap->a_context);
-       if (error == ENOENT)
+       if (error == ENOENT) {
                error = ENOATTR;
                error = ENOATTR;
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_listxattr(
        struct vnop_listxattr_args /* {
 }
 
 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);
 {
        vfs_context_t ctx = ap->a_context;
        nfsnode_t np = VTONFS(ap->a_vp);
@@ -7895,38 +8674,47 @@ nfs4_vnop_listxattr(
        struct direntry *dp;
 
        nmp = VTONMP(ap->a_vp);
        struct direntry *dp;
 
        nmp = VTONMP(ap->a_vp);
-       if (!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);
 
        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) &&
        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);
        adnp = nfs4_named_attr_dir_get(np, 1, ctx);
        nfs_node_clear_busy(np);
-       if (!adnp)
+       if (!adnp) {
                goto out;
                goto out;
+       }
 
 
-       if ((error = nfs_node_lock(adnp)))
+       if ((error = nfs_node_lock(adnp))) {
                goto out;
                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 (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);
                        error = nfs_node_lock(adnp);
-               if (error)
+               }
+               if (error) {
                        goto out;
                        goto out;
+               }
        }
 
        /*
        }
 
        /*
@@ -7935,28 +8723,32 @@ nfs4_vnop_listxattr(
        if (adnp->n_flag & NMODIFIED) {
                nfs_invaldir(adnp);
                nfs_node_unlock(adnp);
        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;
                        goto out;
+               }
        } else {
                nfs_node_unlock(adnp);
        }
        /* nfs_getattr() will check changed and purge caches */
        } 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;
                goto out;
+       }
 
 
-       if (uio && (uio_resid(uio) == 0))
+       if (uio && (uio_resid(uio) == 0)) {
                goto out;
                goto out;
+       }
 
        done = 0;
        nextcookie = lbn = 0;
 
        while (!error && !done) {
 
        done = 0;
        nextcookie = lbn = 0;
 
        while (!error && !done) {
-               OSAddAtomic(1, &nfsstats.biocache_readdirs);
+               OSAddAtomic64(1, &nfsstats.biocache_readdirs);
                cookie = nextcookie;
 getbuffer:
                error = nfs_buf_get(adnp, lbn, NFS_DIRBLKSIZ, vfs_context_thread(ctx), NBLK_READ, &bp);
                cookie = nextcookie;
 getbuffer:
                error = nfs_buf_get(adnp, lbn, NFS_DIRBLKSIZ, vfs_context_thread(ctx), NBLK_READ, &bp);
-               if (error)
+               if (error) {
                        goto out;
                        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 = (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 */
@@ -7966,35 +8758,40 @@ getbuffer:
                                ndbhp->ndbh_ncgen = adnp->n_ncgen;
                        }
                        error = nfs_buf_readdir(bp, ctx);
                                ndbhp->ndbh_ncgen = adnp->n_ncgen;
                        }
                        error = nfs_buf_readdir(bp, ctx);
-                       if (error == NFSERR_DIRBUFDROPPED)
+                       if (error == NFSERR_DIRBUFDROPPED) {
                                goto getbuffer;
                                goto getbuffer;
-                       if (error)
+                       }
+                       if (error) {
                                nfs_buf_release(bp, 1);
                                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 && (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;
                                        error = ENOENT;
+                               }
                        }
                        }
-                       if (error)
+                       if (error) {
                                goto out;
                                goto out;
+                       }
                }
 
                /* go through all the entries copying/counting */
                dp = NFS_DIR_BUF_FIRST_DIRENTRY(bp);
                }
 
                /* 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 {
                        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;
                                                error = ERANGE;
+                                       }
                                }
                        }
                        nextcookie = dp->d_seekoff;
                                }
                        }
                        nextcookie = dp->d_seekoff;
@@ -8005,8 +8802,9 @@ getbuffer:
                        /* hit end of buffer, move to next buffer */
                        lbn = nextcookie;
                        /* if we also hit EOF, we're done */
                        /* 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;
                                done = 1;
+                       }
                }
                if (!error && !done && (nextcookie == cookie)) {
                        printf("nfs readdir cookie didn't change 0x%llx, %d/%d\n", cookie, i, ndbhp->ndbh_count);
                }
                if (!error && !done && (nextcookie == cookie)) {
                        printf("nfs readdir cookie didn't change 0x%llx, %d/%d\n", cookie, i, ndbhp->ndbh_count);
@@ -8015,23 +8813,24 @@ getbuffer:
                nfs_buf_release(bp, 1);
        }
 out:
                nfs_buf_release(bp, 1);
        }
 out:
-       if (adnp)
+       if (adnp) {
                vnode_put(NFSTOV(adnp));
                vnode_put(NFSTOV(adnp));
-       return (error);
+       }
+       return error;
 }
 
 #if NAMEDSTREAMS
 int
 nfs4_vnop_getnamedstream(
        struct vnop_getnamedstream_args /* {
 }
 
 #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;
 {
        vfs_context_t ctx = ap->a_context;
        struct nfsmount *nmp;
@@ -8041,17 +8840,21 @@ nfs4_vnop_getnamedstream(
        int error = 0;
 
        nmp = VTONMP(ap->a_vp);
        int error = 0;
 
        nmp = VTONMP(ap->a_vp);
-       if (!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);
        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) &&
        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 *);
 
        bzero(&cn, sizeof(cn));
        cn.cn_nameptr = __CAST_AWAY_QUALIFIER(ap->a_name, const, char *);
@@ -8060,26 +8863,28 @@ nfs4_vnop_getnamedstream(
        cn.cn_flags = MAKEENTRY;
 
        error = nfs4_named_attr_get(VTONFS(ap->a_vp), &cn, NFS_OPEN_SHARE_ACCESS_NONE,
        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;
                error = ENOATTR;
-       if (!error && anp)
+       }
+       if (!error && anp) {
                *ap->a_svpp = NFSTOV(anp);
                *ap->a_svpp = NFSTOV(anp);
-       else if (anp)
+       } else if (anp) {
                vnode_put(NFSTOV(anp));
                vnode_put(NFSTOV(anp));
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_makenamedstream(
        struct vnop_makenamedstream_args /* {
 }
 
 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;
 {
        vfs_context_t ctx = ap->a_context;
        struct nfsmount *nmp;
@@ -8088,11 +8893,13 @@ nfs4_vnop_makenamedstream(
        int error = 0;
 
        nmp = VTONMP(ap->a_vp);
        int error = 0;
 
        nmp = VTONMP(ap->a_vp);
-       if (!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 *);
 
        bzero(&cn, sizeof(cn));
        cn.cn_nameptr = __CAST_AWAY_QUALIFIER(ap->a_name, const, char *);
@@ -8101,42 +8908,47 @@ nfs4_vnop_makenamedstream(
        cn.cn_flags = MAKEENTRY;
 
        error = nfs4_named_attr_get(VTONFS(ap->a_vp), &cn, NFS_OPEN_SHARE_ACCESS_BOTH,
        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;
                error = ENOATTR;
-       if (!error && anp)
+       }
+       if (!error && anp) {
                *ap->a_svpp = NFSTOV(anp);
                *ap->a_svpp = NFSTOV(anp);
-       else if (anp)
+       } else if (anp) {
                vnode_put(NFSTOV(anp));
                vnode_put(NFSTOV(anp));
-       return (error);
+       }
+       return error;
 }
 
 int
 nfs4_vnop_removenamedstream(
        struct vnop_removenamedstream_args /* {
 }
 
 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;
 
 {
        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 (!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.
         */
 
        /*
         * 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
+#endif /* CONFIG_NFS4 */
mirror of XNU