From owner-cvs-src-old@FreeBSD.ORG Tue Mar 30 23:12:07 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F5BA106571F for ; Tue, 30 Mar 2010 23:12:07 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C2208FC2E for ; Tue, 30 Mar 2010 23:12:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UNC733038225 for ; Tue, 30 Mar 2010 23:12:07 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2UNC720038224 for cvs-src-old@freebsd.org; Tue, 30 Mar 2010 23:12:07 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201003302312.o2UNC720038224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Tue, 30 Mar 2010 23:11:50 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/fs/nfs nfs_commonport.c nfs_commonsubs.c nfs_var.h nfsport.h nfsrvstate.h src/sys/fs/nfsserver nfs_nfsdstate.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2010 23:12:07 -0000 rmacklem 2010-03-30 23:11:50 UTC FreeBSD src repository Modified files: sys/fs/nfs nfs_commonport.c nfs_commonsubs.c nfs_var.h nfsport.h nfsrvstate.h sys/fs/nfsserver nfs_nfsdstate.c Log: SVN rev 205941 on 2010-03-30 23:11:50Z by rmacklem This patch should fix handling of byte range locks locally on the server for the experimental nfs server. When enabled by setting vfs.newnfs.locallocks_enable to non-zero, the experimental nfs server will now acquire byte range locks on the file on behalf of NFSv4 clients, such that lock conflicts between the NFSv4 clients and processes running locally on the server, will be recognized and handled correctly. MFC after: 2 weeks Revision Changes Path 1.7 +6 -2 src/sys/fs/nfs/nfs_commonport.c 1.5 +13 -0 src/sys/fs/nfs/nfs_commonsubs.c 1.10 +1 -0 src/sys/fs/nfs/nfs_var.h 1.17 +3 -0 src/sys/fs/nfs/nfsport.h 1.2 +15 -0 src/sys/fs/nfs/nfsrvstate.h 1.13 +489 -279 src/sys/fs/nfsserver/nfs_nfsdstate.c