From owner-cvs-src-old@FreeBSD.ORG Sun Jan 3 20:08:23 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 B132510656B2 for ; Sun, 3 Jan 2010 20:08:23 +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 9F4F38FC12 for ; Sun, 3 Jan 2010 20:08:23 +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 o03K8Nuv029232 for ; Sun, 3 Jan 2010 20:08:23 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o03K8NUU029231 for cvs-src-old@freebsd.org; Sun, 3 Jan 2010 20:08:23 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201001032008.o03K8NUU029231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Sun, 3 Jan 2010 20:08:10 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: 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: Sun, 03 Jan 2010 20:08:23 -0000 rmacklem 2010-01-03 20:08:10 UTC FreeBSD src repository Modified files: sys/fs/nfsserver nfs_nfsdstate.c Log: SVN rev 201442 on 2010-01-03 20:08:10Z by rmacklem The test for "same client" for the experimental nfs server over NFSv4 was broken w.r.t. byte range lock conflicts when it was the same client and the request used the open_to_lock_owner4 case, since lckstp->ls_clp was not set. This patch fixes it by using "clp" instead of "lckstp->ls_clp". MFC after: 2 weeks Revision Changes Path 1.11 +1 -1 src/sys/fs/nfsserver/nfs_nfsdstate.c