From owner-svn-src-all@FreeBSD.ORG  Thu Feb 21 02:43:45 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 55C567AE;
 Thu, 21 Feb 2013 02:43:45 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 48D0DD1B;
 Thu, 21 Feb 2013 02:43:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1L2hjZp035055;
 Thu, 21 Feb 2013 02:43:45 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1L2hjnT035054;
 Thu, 21 Feb 2013 02:43:45 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201302210243.r1L2hjnT035054@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 21 Feb 2013 02:43:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247072 - head/sys/fs/nfsclient
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Feb 2013 02:43:45 -0000

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".