From owner-svn-src-stable-8@FreeBSD.ORG Sat Jan 15 01:03:27 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2147106564A; Sat, 15 Jan 2011 01:03:26 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D5E818FC08; Sat, 15 Jan 2011 01:03:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0F13Qhm008373; Sat, 15 Jan 2011 01:03:26 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0F13QF3008370; Sat, 15 Jan 2011 01:03:26 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201101150103.p0F13QF3008370@svn.freebsd.org> From: Rick Macklem Date: Sat, 15 Jan 2011 01:03:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217437 - in stable/8/sys/fs: nfs nfsserver X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jan 2011 01:03:27 -0000 Author: rmacklem Date: Sat Jan 15 01:03:26 2011 New Revision: 217437 URL: http://svn.freebsd.org/changeset/base/217437 Log: MFC: r216875 Add support for shared vnode locks for the Read operation in the experimental NFSv4 server. Modified: stable/8/sys/fs/nfs/nfs_commonsubs.c stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- stable/8/sys/fs/nfs/nfs_commonsubs.c Sat Jan 15 00:34:50 2011 (r217436) +++ stable/8/sys/fs/nfs/nfs_commonsubs.c Sat Jan 15 01:03:26 2011 (r217437) @@ -109,7 +109,7 @@ struct nfsv4_opflag nfsv4_opflag[NFSV4OP { 1, 0, 0, 0, LK_EXCLUSIVE }, /* PutFH */ { 1, 0, 0, 0, LK_EXCLUSIVE }, /* PutPubFH */ { 1, 0, 0, 0, LK_EXCLUSIVE }, /* PutRootFH */ - { 0, 1, 0, 0, LK_EXCLUSIVE }, /* Read */ + { 0, 1, 0, 0, LK_SHARED }, /* Read */ { 0, 1, 0, 0, LK_SHARED }, /* Readdir */ { 0, 1, 0, 0, LK_SHARED }, /* ReadLink */ { 0, 2, 1, 1, LK_EXCLUSIVE }, /* Remove */ Modified: stable/8/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Sat Jan 15 00:34:50 2011 (r217436) +++ stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Sat Jan 15 01:03:26 2011 (r217437) @@ -4217,7 +4217,7 @@ static int nfsrv_clientconflict(struct nfsclient *clp, int *haslockp, __unused vnode_t vp, NFSPROC_T *p) { - int gotlock; + int gotlock, lktype; /* * If lease hasn't expired, we can't fix it. @@ -4227,7 +4227,8 @@ nfsrv_clientconflict(struct nfsclient *c return (0); if (*haslockp == 0) { NFSUNLOCKSTATE(); - NFSVOPUNLOCK(vp, 0, p); + lktype = VOP_ISLOCKED(vp); + VOP_UNLOCK(vp, 0); NFSLOCKV4ROOTMUTEX(); nfsv4_relref(&nfsv4rootfs_lock); do { @@ -4236,7 +4237,7 @@ nfsrv_clientconflict(struct nfsclient *c } while (!gotlock); NFSUNLOCKV4ROOTMUTEX(); *haslockp = 1; - NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, lktype | LK_RETRY); return (1); } NFSUNLOCKSTATE(); @@ -4278,7 +4279,7 @@ nfsrv_delegconflict(struct nfsstate *stp vnode_t vp) { struct nfsclient *clp = stp->ls_clp; - int gotlock, error, retrycnt, zapped_clp; + int gotlock, error, lktype, retrycnt, zapped_clp; nfsv4stateid_t tstateid; fhandle_t tfh; @@ -4391,7 +4392,8 @@ nfsrv_delegconflict(struct nfsstate *stp */ if (*haslockp == 0) { NFSUNLOCKSTATE(); - NFSVOPUNLOCK(vp, 0, p); + lktype = VOP_ISLOCKED(vp); + VOP_UNLOCK(vp, 0); NFSLOCKV4ROOTMUTEX(); nfsv4_relref(&nfsv4rootfs_lock); do { @@ -4400,7 +4402,7 @@ nfsrv_delegconflict(struct nfsstate *stp } while (!gotlock); NFSUNLOCKV4ROOTMUTEX(); *haslockp = 1; - NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, lktype | LK_RETRY); return (-1); }