From fd5f155cc424c0526a4d4c75366ebddc7f061d99 Mon Sep 17 00:00:00 2001 From: David Howells Date: Thu, 19 Nov 2009 18:11:58 +0000 Subject: [PATCH] --- yaml --- r: 168838 b: refs/heads/master c: 6511de33c877a53b3df545bc06c29e0f272837ff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cachefiles/namei.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 821275a65106..a68180a92d6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e929b33c3935ecb029b3e495356b2b8af432efa +refs/heads/master: 6511de33c877a53b3df545bc06c29e0f272837ff diff --git a/trunk/fs/cachefiles/namei.c b/trunk/fs/cachefiles/namei.c index 4ce818ae39ea..3df86952ca64 100644 --- a/trunk/fs/cachefiles/namei.c +++ b/trunk/fs/cachefiles/namei.c @@ -254,7 +254,7 @@ int cachefiles_delete_object(struct cachefiles_cache *cache, dir = dget_parent(object->dentry); - mutex_lock(&dir->d_inode->i_mutex); + mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); ret = cachefiles_bury_object(cache, dir, object->dentry); dput(dir); @@ -307,7 +307,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent, /* search the current directory for the element name */ _debug("lookup '%s'", name); - mutex_lock(&dir->d_inode->i_mutex); + mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); start = jiffies; next = lookup_one_len(name, dir, nlen);