]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] ecryptfs: nested locking annotation
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Thu, 8 Mar 2007 04:41:30 +0000 (20:41 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 8 Mar 2007 15:39:16 +0000 (07:39 -0800)
ecryptfs uses a lock_parent() function, which I hope really locks the parents
and is not abused

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ecryptfs/inode.c

index e62f3fc7241edcb9f03ce1e87812e3c9fe0b9bd6..1548be26b5e61060ee5c5eb440209bd98b850724 100644 (file)
@@ -38,7 +38,7 @@ static struct dentry *lock_parent(struct dentry *dentry)
        struct dentry *dir;
 
        dir = dget(dentry->d_parent);
-       mutex_lock(&(dir->d_inode->i_mutex));
+       mutex_lock_nested(&(dir->d_inode->i_mutex), I_MUTEX_PARENT);
        return dir;
 }