diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2014-10-27 15:42:01 +0100 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-28 18:32:47 -0400 |
commit | d1b72cc6d8cb766c802fdc70a5edc2f0ba8a2b57 (patch) | |
tree | 35e1ed80b8a78b53538d73bd99525d17def9a7f5 /fs/namei.c | |
parent | c2096537d40f026672c4c6adfcd7247ce5799604 (diff) | |
download | linux-stable-d1b72cc6d8cb766c802fdc70a5edc2f0ba8a2b57.tar.gz linux-stable-d1b72cc6d8cb766c802fdc70a5edc2f0ba8a2b57.tar.bz2 linux-stable-d1b72cc6d8cb766c802fdc70a5edc2f0ba8a2b57.zip |
overlayfs: fix lockdep misannotation
In an overlay directory that shadows an empty lower directory, say
/mnt/a/empty102, do:
touch /mnt/a/empty102/x
unlink /mnt/a/empty102/x
rmdir /mnt/a/empty102
It's actually harmless, but needs another level of nesting between
I_MUTEX_CHILD and I_MUTEX_NORMAL.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 42df664e95e5..922f27068c4c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2497,7 +2497,7 @@ struct dentry *lock_rename(struct dentry *p1, struct dentry *p2) } mutex_lock_nested(&p1->d_inode->i_mutex, I_MUTEX_PARENT); - mutex_lock_nested(&p2->d_inode->i_mutex, I_MUTEX_CHILD); + mutex_lock_nested(&p2->d_inode->i_mutex, I_MUTEX_PARENT2); return NULL; } EXPORT_SYMBOL(lock_rename); |