btrfs: rename err to ret in btrfs_rmdir()

[ 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>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index af1f22b3cff7dc75f095ab178ad104de621ce330..c2c07ad194c0d9f5d08de25856d506fa152aad3f 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4615,7 +4615,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
 {
        struct inode *inode = d_inode(dentry);
        struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info;
-       int err = 0;
+       int ret = 0;
        struct btrfs_trans_handle *trans;
        u64 last_unlink_trans;
        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);
        }
 
-       err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &fname);
-       if (err)
-               return err;
+       ret = fscrypt_setup_filename(dir, &dentry->d_name, 1, &fname);
+       if (ret)
+               return ret;
 
        /* This needs to handle no-key deletions later on */
 
        trans = __unlink_start_trans(BTRFS_I(dir));
        if (IS_ERR(trans)) {
-               err = PTR_ERR(trans);
+               ret = PTR_ERR(trans);
                goto out_notrans;
        }
 
        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;
        }
 
-       err = btrfs_orphan_add(trans, BTRFS_I(inode));
-       if (err)
+       ret = btrfs_orphan_add(trans, BTRFS_I(inode));
+       if (ret)
                goto out;
 
        last_unlink_trans = BTRFS_I(inode)->last_unlink_trans;
 
        /* 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);
-       if (!err) {
+       if (!ret) {
                btrfs_i_size_write(BTRFS_I(inode), 0);
                /*
                 * Propagate the last_unlink_trans value of the deleted dir to
@@ -4679,7 +4679,7 @@ out_notrans:
        btrfs_btree_balance_dirty(fs_info);
        fscrypt_free_filename(&fname);
 
-       return err;
+       return ret;
 }
 
 /*