dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ovl: narrow locking in ovl_workdir_cleanup_recurse()

Browse Source 
Only take the dir lock when needed, rather than for the whole loop.

Signed-off-by: NeilBrown <neil@brown.name>
Link: https://lore.kernel.org/20250716004725.1206467-15-neil@brown.name
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
NeilBrown
2025-07-18 11:10:42 +02:00
committed by Christian Brauner
parent d56c6feb69
commit a45ee87ded
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/overlayfs/readdir.c
+9 -5
View File
@@ -1122,7 +1122,6 @@ static int ovl_workdir_cleanup_recurse(struct ovl_fs *ofs, const struct path *pa
if (err)
goto out;
inode_lock_nested(dir, I_MUTEX_PARENT);
list_for_each_entry(p, &list, l_node) {
struct dentry *dentry;
@@ -1137,16 +1136,21 @@ static int ovl_workdir_cleanup_recurse(struct ovl_fs *ofs, const struct path *pa
err = -EINVAL;
break;
}
dentry = ovl_lookup_upper(ofs, p->name, path->dentry, p->len);
dentry = ovl_lookup_upper_unlocked(ofs, p->name, path->dentry, p->len);
if (IS_ERR(dentry))
continue;
if (dentry->d_inode)
err = ovl_workdir_cleanup(ofs, dir, path->mnt, dentry, level);
if (dentry->d_inode) {
err = ovl_parent_lock(path->dentry, dentry);
if (!err) {
err = ovl_workdir_cleanup(ofs, dir, path->mnt,
dentry, level);
ovl_parent_unlock(path->dentry);
}
}
dput(dentry);
if (err)
break;
}
inode_unlock(dir);
out:
ovl_cache_free(&list);
return err;