Commit c1db18e2 authored Dec 06, 2019 by Josef Bacik Committed by Greg Kroah-Hartman Dec 31, 2019

btrfs: abort transaction after failed inode updates in create_subvol



commit c7e54b5102bf3614cadb9ca32d7be73bad6cecf0 upstream.

We can just abort the transaction here, and in fact do that for every
other failure in this function except these two cases.

CC: stable@vger.kernel.org # 4.4+
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f7e039d1

fs/btrfs/ioctl.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -705,11 +705,17 @@ static noinline int create_subvol(struct inode *dir,

		btrfs_i_size_write(BTRFS_I(dir), dir->i_size + namelen * 2);
		ret = btrfs_update_inode(trans, root, dir);
		BUG_ON(ret);
		if (ret) {
		btrfs_abort_transaction(trans, ret);
		goto fail;
		}

		ret = btrfs_add_root_ref(trans, objectid, root->root_key.objectid,
		btrfs_ino(BTRFS_I(dir)), index, name, namelen);
		BUG_ON(ret);
		if (ret) {
		btrfs_abort_transaction(trans, ret);
		goto fail;
		}

		ret = btrfs_uuid_tree_add(trans, root_item->uuid,
		BTRFS_UUID_KEY_SUBVOL, objectid);