From 9492e60f0e062a00bf23538138d7397ac1ef8827 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Fri, 10 May 2013 19:50:25 +0100
Subject: [PATCH] --- yaml --- r: 377725 b: refs/heads/master c:
 6bd5e82b099c3d633905098b3c0af808ced73d85 h: refs/heads/master i:   377723:
 a9fe1e39c8cc212a8e82d2716c8f70b9f28357ad v: v3

---
 [refs]                      | 2 +-
 trunk/fs/cachefiles/namei.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36d545a3b041..6f116800e462 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee8be57bc331f00d520c4c8a78ffa9590ed41c2c
+refs/heads/master: 6bd5e82b099c3d633905098b3c0af808ced73d85
diff --git a/trunk/fs/cachefiles/namei.c b/trunk/fs/cachefiles/namei.c
index 8c01c5fcdf75..07cbd447861e 100644
--- a/trunk/fs/cachefiles/namei.c
+++ b/trunk/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));