The patch titled ecryptfs: nested locking annotation has been added to the -mm tree. Its filename is ecryptfs-nested-locking-annotation.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ecryptfs: nested locking annotation From: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> 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@xxxxxxxxx> Cc: Michael Halcrow <mhalcrow@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ecryptfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/ecryptfs/inode.c~ecryptfs-nested-locking-annotation fs/ecryptfs/inode.c --- a/fs/ecryptfs/inode.c~ecryptfs-nested-locking-annotation +++ a/fs/ecryptfs/inode.c @@ -38,7 +38,7 @@ static struct dentry *lock_parent(struct 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; } _ Patches currently in -mm which might be from a.p.zijlstra@xxxxxxxxx are mqueue-nested-locking-annotation.patch ecryptfs-nested-locking-annotation.patch nfs-fix-congestion-control-v4.patch nfs-fix-congestion-control-use-atomic_longs.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html