Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9901618 authored by Filipe Manana's avatar Filipe Manana
Browse files

Btrfs: fix inode leak on failure to setup whiteout inode in rename



If we failed to fully setup the whiteout inode during a rename operation
with the whiteout flag, we ended up leaking the inode, not decrementing
its link count nor removing all its items from the fs/subvol tree.

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
parent cdd1fedf
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -9612,21 +9612,21 @@ static int btrfs_whiteout_for_rename(struct btrfs_trans_handle *trans,
	ret = btrfs_init_inode_security(trans, inode, dir,
				&dentry->d_name);
	if (ret)
		return ret;
		goto out;

	ret = btrfs_add_nondir(trans, dir, dentry,
				inode, 0, index);
	if (ret)
		return ret;
		goto out;

	ret = btrfs_update_inode(trans, root, inode);
	if (ret)
		return ret;

out:
	unlock_new_inode(inode);
	if (ret)
		inode_dec_link_count(inode);
	iput(inode);

	return 0;
	return ret;
}

static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,