From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762398Ab3ECAdb (ORCPT ); Thu, 2 May 2013 20:33:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62854 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762250Ab3ECAd2 (ORCPT ); Thu, 2 May 2013 20:33:28 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 2/8] CacheFiles: name i_mutex lock class explicitly To: linux-cachefs@redhat.com From: David Howells Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, hjayasur@redhat.com, jlayton@redhat.com, linux-kernel@vger.kernel.org Date: Fri, 03 May 2013 01:33:25 +0100 Message-ID: <20130503003325.14952.30066.stgit@warthog.procyon.org.uk> In-Reply-To: <20130503003316.14952.51791.stgit@warthog.procyon.org.uk> References: <20130503003316.14952.51791.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: J. Bruce Fields Just some cleanup. (And note the caller of this function may, for example, call vfs_unlink on a child, so the "1" (I_MUTEX_PARENT) really was what was intended here.) Signed-off-by: J. Bruce Fields Signed-off-by: David Howells --- fs/cachefiles/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c index 8c01c5fc..07cbd44 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c @@ -836,7 +836,7 @@ static struct dentry *cachefiles_check_active(struct cachefiles_cache *cache, // dir->d_name.len, dir->d_name.len, dir->d_name.name, filename); /* look up the victim */ - mutex_lock_nested(&dir->d_inode->i_mutex, 1); + mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); start = jiffies; victim = lookup_one_len(filename, dir, strlen(filename));