samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: rename err to ret in btrfs_rmdir()

Browse Source 
[ Upstream commit c3a1cc8ff48875b050fda5285ac8a9889eb7898d ]

Unify naming of return value to the preferred way.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Stable-dep-of: c466e33e729a ("btrfs: propagate last_unlink_trans earlier when doing a rmdir")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Anand Jain
2024-03-19 11:40:23 +08:00
committed by Greg Kroah-Hartman
parent 2d11d274e2
commit 65d7f92db8
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fs/btrfs/inode.c
View File

@@ -4615,7 +4615,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
{ {
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info; struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info;
int err = 0; int ret = 0;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
u64 last_unlink_trans; u64 last_unlink_trans;
struct fscrypt_name fname; struct fscrypt_name fname;
@@ -4631,33 +4631,33 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
return btrfs_delete_subvolume(BTRFS_I(dir), dentry); return btrfs_delete_subvolume(BTRFS_I(dir), dentry);
} }
err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &fname); ret = fscrypt_setup_filename(dir, &dentry->d_name, 1, &fname);
if (err) if (ret)
return err; return ret;
/* This needs to handle no-key deletions later on */ /* This needs to handle no-key deletions later on */
trans = __unlink_start_trans(BTRFS_I(dir)); trans = __unlink_start_trans(BTRFS_I(dir));
if (IS_ERR(trans)) { if (IS_ERR(trans)) {
err = PTR_ERR(trans); ret = PTR_ERR(trans);
goto out_notrans; goto out_notrans;
} }
if (unlikely(btrfs_ino(BTRFS_I(inode)) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)) { if (unlikely(btrfs_ino(BTRFS_I(inode)) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)) {
err = btrfs_unlink_subvol(trans, BTRFS_I(dir), dentry); ret = btrfs_unlink_subvol(trans, BTRFS_I(dir), dentry);
goto out; goto out;
} }
err = btrfs_orphan_add(trans, BTRFS_I(inode)); ret = btrfs_orphan_add(trans, BTRFS_I(inode));
if (err) if (ret)
goto out; goto out;
last_unlink_trans = BTRFS_I(inode)->last_unlink_trans; last_unlink_trans = BTRFS_I(inode)->last_unlink_trans;
/* now the directory is empty */ /* now the directory is empty */
err = btrfs_unlink_inode(trans, BTRFS_I(dir), BTRFS_I(d_inode(dentry)), ret = btrfs_unlink_inode(trans, BTRFS_I(dir), BTRFS_I(d_inode(dentry)),
&fname.disk_name); &fname.disk_name);
if (!err) { if (!ret) {
btrfs_i_size_write(BTRFS_I(inode), 0); btrfs_i_size_write(BTRFS_I(inode), 0);
/* /*
* Propagate the last_unlink_trans value of the deleted dir to * Propagate the last_unlink_trans value of the deleted dir to
@@ -4679,7 +4679,7 @@ out_notrans:
btrfs_btree_balance_dirty(fs_info); btrfs_btree_balance_dirty(fs_info);
fscrypt_free_filename(&fname); fscrypt_free_filename(&fname);
return err; return ret;
} }
/* /*