From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:22291 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141Ab3GIKu2 (ORCPT ); Tue, 9 Jul 2013 06:50:28 -0400 Date: Tue, 9 Jul 2013 06:50:27 -0400 From: Jeff Layton To: "J. Bruce Fields" Cc: Al Viro , linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 02/12] vfs: don't use PARENT/CHILD lock classes for non-directories Message-ID: <20130709065027.226e5360@tlielax.poochiereds.net> In-Reply-To: <1372882356-14168-3-git-send-email-bfields@redhat.com> References: <1372882356-14168-1-git-send-email-bfields@redhat.com> <1372882356-14168-3-git-send-email-bfields@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-nfs-owner@vger.kernel.org List-ID: On Wed, 3 Jul 2013 16:12:26 -0400 "J. Bruce Fields" wrote: > From: "J. Bruce Fields" > > Reserve I_MUTEX_PARENT and I_MUTEX_CHILD for locking of actual > directories. > > (Also I_MUTEX_QUOTA isn't really a meaningful name for this locking > class any more; fixed in a later patch.) > > Signed-off-by: J. Bruce Fields > --- > fs/inode.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/inode.c b/fs/inode.c > index b8afbc7..942451b 100644 > --- a/fs/inode.c > +++ b/fs/inode.c > @@ -987,11 +987,11 @@ EXPORT_SYMBOL(unlock_new_inode); > void lock_two_nondirectories(struct inode *inode1, struct inode *inode2) > { > if (inode1 < inode2) { > - mutex_lock_nested(&inode1->i_mutex, I_MUTEX_PARENT); > - mutex_lock_nested(&inode2->i_mutex, I_MUTEX_CHILD); > + mutex_lock(&inode1->i_mutex); > + mutex_lock_nested(&inode2->i_mutex, I_MUTEX_QUOTA); > } else { > - mutex_lock_nested(&inode2->i_mutex, I_MUTEX_PARENT); > - mutex_lock_nested(&inode1->i_mutex, I_MUTEX_CHILD); > + mutex_lock(&inode2->i_mutex); > + mutex_lock_nested(&inode1->i_mutex, I_MUTEX_QUOTA); > } > } > EXPORT_SYMBOL(lock_two_nondirectories); Acked-by: Jeff Layton