diff options
| author | NeilBrown <neil@brown.name> | 2025-07-16 10:44:32 +1000 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-07-18 11:10:43 +0200 |
| commit | fe4d3360f9cbb513be6d74bdeb154728cad5c437 (patch) | |
| tree | 945e7775f57801939d258926ba31b76c1a3f0897 /fs/overlayfs/dir.c | |
| parent | ee37c3cfc5df9013dadf42919ca65510abc15632 (diff) | |
ovl: rename ovl_cleanup_unlocked() to ovl_cleanup()
The only remaining user of ovl_cleanup() is ovl_cleanup_locked(), so we
no longer need both.
This patch renames ovl_cleanup() to ovl_cleanup_locked() and makes it
static.
ovl_cleanup_unlocked() is renamed to ovl_cleanup().
Signed-off-by: NeilBrown <neil@brown.name>
Link: https://lore.kernel.org/20250716004725.1206467-22-neil@brown.name
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/overlayfs/dir.c')
| -rw-r--r-- | fs/overlayfs/dir.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c index dedf89546e5f..30619777f0f6 100644 --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c @@ -24,7 +24,8 @@ MODULE_PARM_DESC(redirect_max, static int ovl_set_redirect(struct dentry *dentry, bool samedir); -int ovl_cleanup(struct ovl_fs *ofs, struct inode *wdir, struct dentry *wdentry) +static int ovl_cleanup_locked(struct ovl_fs *ofs, struct inode *wdir, + struct dentry *wdentry) { int err; @@ -43,8 +44,8 @@ int ovl_cleanup(struct ovl_fs *ofs, struct inode *wdir, struct dentry *wdentry) return err; } -int ovl_cleanup_unlocked(struct ovl_fs *ofs, struct dentry *workdir, - struct dentry *wdentry) +int ovl_cleanup(struct ovl_fs *ofs, struct dentry *workdir, + struct dentry *wdentry) { int err; @@ -52,7 +53,7 @@ int ovl_cleanup_unlocked(struct ovl_fs *ofs, struct dentry *workdir, if (err) return err; - ovl_cleanup(ofs, workdir->d_inode, wdentry); + ovl_cleanup_locked(ofs, workdir->d_inode, wdentry); ovl_parent_unlock(workdir); return 0; @@ -149,14 +150,14 @@ int ovl_cleanup_and_whiteout(struct ovl_fs *ofs, struct dentry *dir, if (err) goto kill_whiteout; if (flags) - ovl_cleanup_unlocked(ofs, ofs->workdir, dentry); + ovl_cleanup(ofs, ofs->workdir, dentry); out: dput(whiteout); return err; kill_whiteout: - ovl_cleanup_unlocked(ofs, ofs->workdir, whiteout); + ovl_cleanup(ofs, ofs->workdir, whiteout); goto out; } @@ -351,7 +352,7 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode, return 0; out_cleanup: - ovl_cleanup_unlocked(ofs, upperdir, newdentry); + ovl_cleanup(ofs, upperdir, newdentry); dput(newdentry); return err; } @@ -411,7 +412,7 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry, goto out_cleanup_unlocked; ovl_cleanup_whiteouts(ofs, upper, list); - ovl_cleanup_unlocked(ofs, workdir, upper); + ovl_cleanup(ofs, workdir, upper); /* dentry's upper doesn't match now, get rid of it */ d_drop(dentry); @@ -421,7 +422,7 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry, out_cleanup: unlock_rename(workdir, upperdir); out_cleanup_unlocked: - ovl_cleanup_unlocked(ofs, workdir, opaquedir); + ovl_cleanup(ofs, workdir, opaquedir); dput(opaquedir); out: return ERR_PTR(err); @@ -516,7 +517,7 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode, if (err) goto out_cleanup_unlocked; - ovl_cleanup_unlocked(ofs, workdir, upper); + ovl_cleanup(ofs, workdir, upper); } else { err = ovl_do_rename(ofs, workdir, newdentry, upperdir, upper, 0); unlock_rename(workdir, upperdir); @@ -526,7 +527,7 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode, ovl_dir_modified(dentry->d_parent, false); err = ovl_instantiate(dentry, inode, newdentry, hardlink, NULL); if (err) { - ovl_cleanup_unlocked(ofs, upperdir, newdentry); + ovl_cleanup(ofs, upperdir, newdentry); dput(newdentry); } out_dput: @@ -541,7 +542,7 @@ out: out_cleanup: unlock_rename(workdir, upperdir); out_cleanup_unlocked: - ovl_cleanup_unlocked(ofs, workdir, newdentry); + ovl_cleanup(ofs, workdir, newdentry); dput(newdentry); goto out_dput; } @@ -1268,7 +1269,7 @@ static int ovl_rename(struct mnt_idmap *idmap, struct inode *olddir, goto out_revert_creds; if (cleanup_whiteout) - ovl_cleanup_unlocked(ofs, old_upperdir, newdentry); + ovl_cleanup(ofs, old_upperdir, newdentry); if (overwrite && d_inode(new)) { if (new_is_dir) |