svn commit: r247072 - head/sys/fs/nfsclient

Warner Losh imp at FreeBSD.org
Thu Feb 21 02:43:45 UTC 2013


Author: imp
Date: Thu Feb 21 02:43:44 2013
New Revision: 247072
URL: http://svnweb.freebsd.org/changeset/base/247072

Log:
  The request queue is already locked, so we don't need the splsofclock/splx
  here to note future work.

Modified:
  head/sys/fs/nfsclient/nfs_clstate.c

Modified: head/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clstate.c	Thu Feb 21 02:41:37 2013	(r247071)
+++ head/sys/fs/nfsclient/nfs_clstate.c	Thu Feb 21 02:43:44 2013	(r247072)
@@ -1888,7 +1888,7 @@ nfscl_recover(struct nfsclclient *clp, s
 	struct nfsreq *rep;
 	u_int64_t len;
 	u_int32_t delegtype = NFSV4OPEN_DELEGATEWRITE, mode;
-	int i, igotlock = 0, error, trycnt, firstlock, s;
+	int i, igotlock = 0, error, trycnt, firstlock;
 	struct nfscllayout *lyp, *nlyp;
 
 	/*
@@ -1945,14 +1945,12 @@ nfscl_recover(struct nfsclclient *clp, s
 	 * This will be translated to NFSERR_STALEDONTRECOVER when
 	 * R_DONTRECOVER is set.
 	 */
-	s = splsoftclock();
 	NFSLOCKREQ();
 	TAILQ_FOREACH(rep, &nfsd_reqq, r_chain) {
 		if (rep->r_nmp == nmp)
 			rep->r_flags |= R_DONTRECOVER;
 	}
 	NFSUNLOCKREQ();
-	splx(s);
 
 	/*
 	 * Now, mark all delegations "need reclaim".


More information about the svn-src-head mailing list