Commit 2c536799 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

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: default avatarJeff Mahoney <jeffm@suse.com>
parent 3fbe5c02

fs/btrfs/ctree.h

+3 −3
Original line number Diff line number Diff line
@@ -2661,9 +2661,9 @@ static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p) 
}

int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path);

int btrfs_leaf_free_space(struct btrfs_root *root, struct extent_buffer *leaf);

void btrfs_drop_snapshot(struct btrfs_root *root,

			 struct btrfs_block_rsv *block_rsv, int update_ref,

			 int for_reloc);

int __must_check btrfs_drop_snapshot(struct btrfs_root *root,

				     struct btrfs_block_rsv *block_rsv,

				     int update_ref, int for_reloc);

int btrfs_drop_subtree(struct btrfs_trans_handle *trans,

			struct btrfs_root *root,

			struct extent_buffer *node,

fs/btrfs/extent-tree.c

+2 −2
Original line number Diff line number Diff line
@@ -6734,7 +6734,7 @@ static noinline int walk_up_tree(struct btrfs_trans_handle *trans, 
 * also make sure backrefs for the shared block and all lower level

 * blocks are properly updated.

 */

void btrfs_drop_snapshot(struct btrfs_root *root,

int btrfs_drop_snapshot(struct btrfs_root *root,

			 struct btrfs_block_rsv *block_rsv, int update_ref,

			 int for_reloc)

{
@@ -6902,7 +6902,7 @@ out_free: 
out:

	if (err)

		btrfs_std_error(root->fs_info, err);

	return;

	return err;

}



/*

fs/btrfs/relocation.c

+2 −1
Original line number Diff line number Diff line
@@ -2272,7 +2272,8 @@ again: 
		} else {

			list_del_init(&reloc_root->root_list);

		}

		btrfs_drop_snapshot(reloc_root, rc->block_rsv, 0, 1);

		ret = btrfs_drop_snapshot(reloc_root, rc->block_rsv, 0, 1);

		BUG_ON(ret < 0);

	}



	if (found) {

fs/btrfs/transaction.c

+5 −2
Original line number Diff line number Diff line
@@ -1387,6 +1387,8 @@ int btrfs_clean_old_snapshots(struct btrfs_root *root) 
	spin_unlock(&fs_info->trans_lock);



	while (!list_empty(&list)) {

		int ret;



		root = list_entry(list.next, struct btrfs_root, root_list);

		list_del(&root->root_list);
@@ -1394,9 +1396,10 @@ int btrfs_clean_old_snapshots(struct btrfs_root *root) 


		if (btrfs_header_backref_rev(root->node) <

		    BTRFS_MIXED_BACKREF_REV)

			btrfs_drop_snapshot(root, NULL, 0, 0);

			ret = btrfs_drop_snapshot(root, NULL, 0, 0);

		else

			btrfs_drop_snapshot(root, NULL, 1, 0);

			ret =btrfs_drop_snapshot(root, NULL, 1, 0);

		BUG_ON(ret < 0);

	}

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE