summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/fs/nfs/nfs_commonkrpc.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index 47e5a37..bdba851 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -336,24 +336,25 @@ newnfs_connect(struct nfsmount *nmp, struct nfssockreq *nrp,
mtx_lock(&nrp->nr_mtx);
if (nrp->nr_client != NULL) {
+ mtx_unlock(&nrp->nr_mtx);
/*
* Someone else already connected.
*/
CLNT_RELEASE(client);
} else {
nrp->nr_client = client;
+ /*
+ * Protocols that do not require connections may be optionally
+ * left unconnected for servers that reply from a port other
+ * than NFS_PORT.
+ */
+ if (nmp == NULL || (nmp->nm_flag & NFSMNT_NOCONN) == 0) {
+ mtx_unlock(&nrp->nr_mtx);
+ CLNT_CONTROL(client, CLSET_CONNECT, &one);
+ } else
+ mtx_unlock(&nrp->nr_mtx);
}
- /*
- * Protocols that do not require connections may be optionally left
- * unconnected for servers that reply from a port other than NFS_PORT.
- */
- if (nmp == NULL || (nmp->nm_flag & NFSMNT_NOCONN) == 0) {
- mtx_unlock(&nrp->nr_mtx);
- CLNT_CONTROL(client, CLSET_CONNECT, &one);
- } else {
- mtx_unlock(&nrp->nr_mtx);
- }
/* Restore current thread's credentials. */
td->td_ucred = origcred;
OpenPOWER on IntegriCloud