mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-19 06:38:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

ovl: narrow locking in ovl_create_upper()

Browse Source 
Drop the directory lock immediately after the ovl_create_real() call and
take a separate lock later for cleanup in ovl_cleanup_unlocked() - if
needed.

This makes way for future changes where locks are taken on individual
dentries rather than the whole directory.

Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: NeilBrown <neil@brown.name>
Link: https://lore.kernel.org/20250716004725.1206467-6-neil@brown.name
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
NeilBrown
2025-07-16 10:44:16 +10:00
committed by Christian Brauner
parent a735bdf0b7
commit a07052e07b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/overlayfs/dir.c
View File

@@ -326,9 +326,9 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
ovl_lookup_upper(ofs, dentry->d_name.name,
upperdir, dentry->d_name.len),
attr);
err = PTR_ERR(newdentry);
inode_unlock(udir);
if (IS_ERR(newdentry))
goto out_unlock;
return PTR_ERR(newdentry);
if (ovl_type_merge(dentry->d_parent) && d_is_dir(newdentry) &&
!ovl_allow_offline_changes(ofs)) {
@@ -340,14 +340,12 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
err = ovl_instantiate(dentry, inode, newdentry, !!attr->hardlink, NULL);
if (err)
goto out_cleanup;
out_unlock:
inode_unlock(udir);
return err;
return 0;
out_cleanup:
ovl_cleanup(ofs, udir, newdentry);
ovl_cleanup_unlocked(ofs, upperdir, newdentry);
dput(newdentry);
goto out_unlock;
return err;
}
static struct dentry *ovl_clear_empty(struct dentry *dentry,