Commit b9729ce0 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: locking: rip out path->leave_spinning 



We no longer distinguish between blocking and spinning, so rip out all
this code.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ac5887c8

fs/btrfs/backref.c

+0 −3
Original line number Diff line number Diff line
@@ -1669,13 +1669,11 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path, 
	s64 bytes_left = ((s64)size) - 1;

	struct extent_buffer *eb = eb_in;

	struct btrfs_key found_key;

	int leave_spinning = path->leave_spinning;

	struct btrfs_inode_ref *iref;



	if (bytes_left >= 0)

		dest[bytes_left] = '\0';



	path->leave_spinning = 1;

	while (1) {

		bytes_left -= name_len;

		if (bytes_left >= 0)
@@ -1719,7 +1717,6 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path, 
	}



	btrfs_release_path(path);

	path->leave_spinning = leave_spinning;



	if (ret)

		return ERR_PTR(ret);

fs/btrfs/ctree.c

+0 −3
Original line number Diff line number Diff line
@@ -5327,7 +5327,6 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 
	struct btrfs_key key;

	u32 nritems;

	int ret;

	int old_spinning = path->leave_spinning;

	int next_rw_lock = 0;



	nritems = btrfs_header_nritems(path->nodes[0]);
@@ -5342,7 +5341,6 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 
	btrfs_release_path(path);



	path->keep_locks = 1;

	path->leave_spinning = 1;



	if (time_seq)

		ret = btrfs_search_old_slot(root, &key, path, time_seq);
@@ -5477,7 +5475,6 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 
	ret = 0;

done:

	unlock_up(path, 0, 1, 0, NULL);

	path->leave_spinning = old_spinning;



	return ret;

}

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ struct btrfs_path { 
	unsigned int search_for_split:1;

	unsigned int keep_locks:1;

	unsigned int skip_locking:1;

	unsigned int leave_spinning:1;

	unsigned int search_commit_root:1;

	unsigned int need_commit_sem:1;

	unsigned int skip_release_on_error:1;

fs/btrfs/delayed-inode.c

+0 −4
Original line number Diff line number Diff line
@@ -1147,7 +1147,6 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans, int nr) 
	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;

	path->leave_spinning = 1;



	block_rsv = trans->block_rsv;

	trans->block_rsv = &fs_info->delayed_block_rsv;
@@ -1212,7 +1211,6 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, 
		btrfs_release_delayed_node(delayed_node);

		return -ENOMEM;

	}

	path->leave_spinning = 1;



	block_rsv = trans->block_rsv;

	trans->block_rsv = &delayed_node->root->fs_info->delayed_block_rsv;
@@ -1257,7 +1255,6 @@ int btrfs_commit_inode_delayed_inode(struct btrfs_inode *inode) 
		ret = -ENOMEM;

		goto trans_out;

	}

	path->leave_spinning = 1;



	block_rsv = trans->block_rsv;

	trans->block_rsv = &fs_info->delayed_block_rsv;
@@ -1326,7 +1323,6 @@ static void btrfs_async_run_delayed_root(struct btrfs_work *work) 
		if (!delayed_node)

			break;



		path->leave_spinning = 1;

		root = delayed_node->root;



		trans = btrfs_join_transaction(root);

fs/btrfs/dir-item.c

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name, 
	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;

	path->leave_spinning = 1;



	btrfs_cpu_key_to_disk(&disk_key, location);