From mboxrd@z Thu Jan 1 00:00:00 1970 From: NeilBrown Subject: [PATCH 001 of 11] knfsd: nfsd: lockdep annotation fix Date: Thu, 24 Aug 2006 16:36:34 +1000 Message-ID: <1060824063634.4913@suse.de> References: <20060824162917.3600.patches@notabene> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: nfs@lists.sourceforge.net, linux-kernel@vger.kernel.org Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list2-new.sourceforge.net with esmtp (Exim 4.43) id 1GG8pP-0002yg-KB for nfs@lists.sourceforge.net; Wed, 23 Aug 2006 23:36:35 -0700 Received: from mail.suse.de ([195.135.220.2] helo=mx1.suse.de) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1GG8pO-0002h0-Uw for nfs@lists.sourceforge.net; Wed, 23 Aug 2006 23:36:36 -0700 To: Andrew Morton List-Id: "Discussion of NFS under Linux development, interoperability, and testing." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nfs-bounces@lists.sourceforge.net Errors-To: nfs-bounces@lists.sourceforge.net nfsv2 needs the I_MUTEX_PARENT on the directory when creating a file too. Signed-off-by: Neil Brown ### Diffstat output ./fs/nfsd/nfsproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff .prev/fs/nfsd/nfsproc.c ./fs/nfsd/nfsproc.c --- .prev/fs/nfsd/nfsproc.c 2006-08-24 16:21:23.000000000 +1000 +++ ./fs/nfsd/nfsproc.c 2006-08-24 16:21:35.000000000 +1000 @@ -225,7 +225,7 @@ nfsd_proc_create(struct svc_rqst *rqstp, nfserr = nfserr_exist; if (isdotent(argp->name, argp->len)) goto done; - fh_lock(dirfhp); + fh_lock_nested(dirfhp, I_MUTEX_PARENT); dchild = lookup_one_len(argp->name, dirfhp->fh_dentry, argp->len); if (IS_ERR(dchild)) { nfserr = nfserrno(PTR_ERR(dchild)); ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ NFS maillist - NFS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030336AbWHXGgd (ORCPT ); Thu, 24 Aug 2006 02:36:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030337AbWHXGgd (ORCPT ); Thu, 24 Aug 2006 02:36:33 -0400 Received: from ns1.suse.de ([195.135.220.2]:33478 "EHLO mx1.suse.de") by vger.kernel.org with ESMTP id S1030336AbWHXGgc (ORCPT ); Thu, 24 Aug 2006 02:36:32 -0400 From: NeilBrown To: Andrew Morton Date: Thu, 24 Aug 2006 16:36:34 +1000 Message-Id: <1060824063634.4913@suse.de> X-face: [Gw_3E*Gng}4rRrKRYotwlE?.2|**#s9D Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org nfsv2 needs the I_MUTEX_PARENT on the directory when creating a file too. Signed-off-by: Neil Brown ### Diffstat output ./fs/nfsd/nfsproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff .prev/fs/nfsd/nfsproc.c ./fs/nfsd/nfsproc.c --- .prev/fs/nfsd/nfsproc.c 2006-08-24 16:21:23.000000000 +1000 +++ ./fs/nfsd/nfsproc.c 2006-08-24 16:21:35.000000000 +1000 @@ -225,7 +225,7 @@ nfsd_proc_create(struct svc_rqst *rqstp, nfserr = nfserr_exist; if (isdotent(argp->name, argp->len)) goto done; - fh_lock(dirfhp); + fh_lock_nested(dirfhp, I_MUTEX_PARENT); dchild = lookup_one_len(argp->name, dirfhp->fh_dentry, argp->len); if (IS_ERR(dchild)) { nfserr = nfserrno(PTR_ERR(dchild));