evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

btrfs: fix error handling in create_pending_snapshot

Browse source 
fcebe456 cut and pasted some code to a later point
in create_pending_snapshot(), but didn't switch
to the appropriate error handling for this stage
of the function.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Eric Sandeen 2014-06-12 00:53:44 -05:00 • committed by Chris Mason
parent 3e2426bd0e
commit 47a306a748
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/btrfs/transaction.c
View file

@ -1284,11 +1284,13 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
goto fail; goto fail;
} }
pending->error = btrfs_qgroup_inherit(trans, fs_info, ret = btrfs_qgroup_inherit(trans, fs_info,
root->root_key.objectid, root->root_key.objectid,
objectid, pending->inherit); objectid, pending->inherit);
if (pending->error) if (ret) {
goto no_free_objectid; btrfs_abort_transaction(trans, root, ret);
goto fail;
}
/* see comments in should_cow_block() */ /* see comments in should_cow_block() */
set_bit(BTRFS_ROOT_FORCE_COW, &root->state); set_bit(BTRFS_ROOT_FORCE_COW, &root->state);