Merge tag 'for-6.2-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[sfrench/cifs-2.6.git] / fs / btrfs / inode.c

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8bcad994015487e9a049c7f0d99b1f685176afa8..2ead7b1bdbaf141489ac3186f2d7817d18aa636d 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9377,8 +9377,10 @@ static int btrfs_rename(struct user_namespace *mnt_userns,
 
        if (flags & RENAME_WHITEOUT) {
                whiteout_args.inode = new_whiteout_inode(mnt_userns, old_dir);
-               if (!whiteout_args.inode)
-                       return -ENOMEM;
+               if (!whiteout_args.inode) {
+                       ret = -ENOMEM;
+                       goto out_fscrypt_names;
+               }
                ret = btrfs_new_inode_prepare(&whiteout_args, &trans_num_items);
                if (ret)
                        goto out_whiteout_inode;