diff options
| -rw-r--r-- | fs/overlayfs/util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index c25c86e0f4da..7a1ca9380601 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -1078,7 +1078,6 @@ static void ovl_cleanup_index(struct dentry *dentry) { struct ovl_fs *ofs = OVL_FS(dentry->d_sb); struct dentry *indexdir = ovl_indexdir(dentry->d_sb); - struct inode *dir = indexdir->d_inode; struct dentry *lowerdentry = ovl_dentry_lower(dentry); struct dentry *upperdentry = ovl_dentry_upper(dentry); struct dentry *index = NULL; @@ -1114,21 +1113,22 @@ static void ovl_cleanup_index(struct dentry *dentry) goto out; } - inode_lock_nested(dir, I_MUTEX_PARENT); - index = ovl_lookup_upper(ofs, name.name, indexdir, name.len); + index = ovl_lookup_upper_unlocked(ofs, name.name, indexdir, name.len); err = PTR_ERR(index); if (IS_ERR(index)) { index = NULL; } else if (ovl_index_all(dentry->d_sb)) { /* Whiteout orphan index to block future open by handle */ - err = ovl_cleanup_and_whiteout(OVL_FS(dentry->d_sb), - indexdir, index); + err = ovl_parent_lock(indexdir, index); + if (!err) { + err = ovl_cleanup_and_whiteout(OVL_FS(dentry->d_sb), + indexdir, index); + ovl_parent_unlock(indexdir); + } } else { /* Cleanup orphan index entries */ - err = ovl_cleanup(ofs, dir, index); + err = ovl_cleanup_unlocked(ofs, indexdir, index); } - - inode_unlock(dir); if (err) goto fail; |