diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2007-03-08 05:41:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-08 16:39:16 +0100 |
| commit | 908e0a8a265fe8057604a9a30aec3f0be7bb5ebb (patch) | |
| tree | e4216141e4083a1c3ccfb51f53f14685758a52f1 /fs | |
| parent | [PATCH] 2.6 Altix: console fix for CONFIG_DEBUG_SHIRQ usage (diff) | |
| download | linux-908e0a8a265fe8057604a9a30aec3f0be7bb5ebb.tar.xz linux-908e0a8a265fe8057604a9a30aec3f0be7bb5ebb.zip | |
[PATCH] ecryptfs: nested locking annotation
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ecryptfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index e62f3fc7241e..1548be26b5e6 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -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; } |