aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent-tree.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-10-03 23:22:41 -0400
committerDavid Sterba <dsterba@suse.cz>2012-03-21 20:45:36 -0400
commit2c536799f1bde905bbacf7af3aa6be3f4de66005 (patch)
tree54f306bf4320d97e73f9728268a99910b234d048 /fs/btrfs/extent-tree.c
parent3fbe5c02ae5a59053d779392b9a12aa8f6d6198e (diff)
btrfs: btrfs_drop_snapshot should return int
Commit cb1b69f4 (Btrfs: forced readonly when btrfs_drop_snapshot() fails) made btrfs_drop_snapshot return void because there were no callers checking the return value. That is the wrong order to handle error propogation since the caller will have no idea that an error has occured and continue on as if nothing went wrong. Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r--fs/btrfs/extent-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 0daa1df16439..cd6f8ae0a78d 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6734,7 +6734,7 @@ static noinline int walk_up_tree(struct btrfs_trans_handle *trans,
6734 * also make sure backrefs for the shared block and all lower level 6734 * also make sure backrefs for the shared block and all lower level
6735 * blocks are properly updated. 6735 * blocks are properly updated.
6736 */ 6736 */
6737void btrfs_drop_snapshot(struct btrfs_root *root, 6737int btrfs_drop_snapshot(struct btrfs_root *root,
6738 struct btrfs_block_rsv *block_rsv, int update_ref, 6738 struct btrfs_block_rsv *block_rsv, int update_ref,
6739 int for_reloc) 6739 int for_reloc)
6740{ 6740{
@@ -6902,7 +6902,7 @@ out_free:
6902out: 6902out:
6903 if (err) 6903 if (err)
6904 btrfs_std_error(root->fs_info, err); 6904 btrfs_std_error(root->fs_info, err);
6905 return; 6905 return err;
6906} 6906}
6907 6907
6908/* 6908/*