Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de78b51a authored by Eric Sandeen's avatar Eric Sandeen Committed by Josef Bacik
Browse files

btrfs: remove cache only arguments from defrag path 



The entry point at the defrag ioctl always sets "cache only" to 0;
the codepaths haven't run for a long time as far as I can
tell.  Chris says they're dead code, so remove them.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent e4a2bcac

fs/btrfs/ctree.c

+10 −55
Original line number Diff line number Diff line
@@ -1442,7 +1442,7 @@ int btrfs_comp_cpu_keys(struct btrfs_key *k1, struct btrfs_key *k2) 
 */

int btrfs_realloc_node(struct btrfs_trans_handle *trans,

		       struct btrfs_root *root, struct extent_buffer *parent,

		       int start_slot, int cache_only, u64 *last_ret,

		       int start_slot, u64 *last_ret,

		       struct btrfs_key *progress)

{

	struct extent_buffer *cur;
@@ -1462,8 +1462,6 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans, 
	struct btrfs_disk_key disk_key;



	parent_level = btrfs_header_level(parent);

	if (cache_only && parent_level != 1)

		return 0;



	WARN_ON(trans->transaction != root->fs_info->running_transaction);

	WARN_ON(trans->transid != root->fs_info->generation);
@@ -1509,10 +1507,6 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans, 
		else

			uptodate = 0;

		if (!cur || !uptodate) {

			if (cache_only) {

				free_extent_buffer(cur);

				continue;

			}

			if (!cur) {

				cur = read_tree_block(root, blocknr,

							 blocksize, gen);
@@ -4826,8 +4820,8 @@ int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path) 


/*

 * A helper function to walk down the tree starting at min_key, and looking

 * for nodes or leaves that are either in cache or have a minimum

 * transaction id.  This is used by the btree defrag code, and tree logging

 * for nodes or leaves that are have a minimum transaction id.

 * This is used by the btree defrag code, and tree logging

 *

 * This does not cow, but it does stuff the starting key it finds back

 * into min_key, so you can call btrfs_search_slot with cow=1 on the
@@ -4848,7 +4842,7 @@ int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path) 
 */

int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key,

			 struct btrfs_key *max_key,

			 struct btrfs_path *path, int cache_only,

			 struct btrfs_path *path,

			 u64 min_trans)

{

	struct extent_buffer *cur;
@@ -4888,15 +4882,12 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, 
		if (sret && slot > 0)

			slot--;

		/*

		 * check this node pointer against the cache_only and

		 * min_trans parameters.  If it isn't in cache or is too

		 * old, skip to the next one.

		 * check this node pointer against the min_trans parameters.

		 * If it is too old, old, skip to the next one.

		 */

		while (slot < nritems) {

			u64 blockptr;

			u64 gen;

			struct extent_buffer *tmp;

			struct btrfs_disk_key disk_key;



			blockptr = btrfs_node_blockptr(cur, slot);

			gen = btrfs_node_ptr_generation(cur, slot);
@@ -4904,27 +4895,7 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, 
				slot++;

				continue;

			}

			if (!cache_only)

			break;



			if (max_key) {

				btrfs_node_key(cur, &disk_key, slot);

				if (comp_keys(&disk_key, max_key) >= 0) {

					ret = 1;

					goto out;

				}

			}



			tmp = btrfs_find_tree_block(root, blockptr,

					    btrfs_level_size(root, level - 1));



			if (tmp && btrfs_buffer_uptodate(tmp, gen, 1) > 0) {

				free_extent_buffer(tmp);

				break;

			}

			if (tmp)

				free_extent_buffer(tmp);

			slot++;

		}

find_next_key:

		/*
@@ -4935,7 +4906,7 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, 
			path->slots[level] = slot;

			btrfs_set_path_blocking(path);

			sret = btrfs_find_next_key(root, path, min_key, level,

						  cache_only, min_trans);

						  min_trans);

			if (sret == 0) {

				btrfs_release_path(path);

				goto again;
@@ -5400,8 +5371,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root, 
/*

 * this is similar to btrfs_next_leaf, but does not try to preserve

 * and fixup the path.  It looks for and returns the next key in the

 * tree based on the current path and the cache_only and min_trans

 * parameters.

 * tree based on the current path and the min_trans parameters.

 *

 * 0 is returned if another key is found, < 0 if there are any errors

 * and 1 is returned if there are no higher keys in the tree
@@ -5410,8 +5380,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root, 
 * calling this function.

 */

int btrfs_find_next_key(struct btrfs_root *root, struct btrfs_path *path,

			struct btrfs_key *key, int level,

			int cache_only, u64 min_trans)

			struct btrfs_key *key, int level, u64 min_trans)

{

	int slot;

	struct extent_buffer *c;
@@ -5462,22 +5431,8 @@ int btrfs_find_next_key(struct btrfs_root *root, struct btrfs_path *path, 
		if (level == 0)

			btrfs_item_key_to_cpu(c, key, slot);

		else {

			u64 blockptr = btrfs_node_blockptr(c, slot);

			u64 gen = btrfs_node_ptr_generation(c, slot);



			if (cache_only) {

				struct extent_buffer *cur;

				cur = btrfs_find_tree_block(root, blockptr,

					    btrfs_level_size(root, level - 1));

				if (!cur ||

				    btrfs_buffer_uptodate(cur, gen, 1) <= 0) {

					slot++;

					if (cur)

						free_extent_buffer(cur);

					goto next;

				}

				free_extent_buffer(cur);

			}

			if (gen < min_trans) {

				slot++;

				goto next;

fs/btrfs/ctree.h

+4 −4
Original line number Diff line number Diff line
@@ -3125,10 +3125,10 @@ struct extent_buffer *btrfs_root_node(struct btrfs_root *root); 
struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root);

int btrfs_find_next_key(struct btrfs_root *root, struct btrfs_path *path,

			struct btrfs_key *key, int lowest_level,

			int cache_only, u64 min_trans);

			u64 min_trans);

int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key,

			 struct btrfs_key *max_key,

			 struct btrfs_path *path, int cache_only,

			 struct btrfs_path *path,

			 u64 min_trans);

enum btrfs_compare_tree_result {

	BTRFS_COMPARE_TREE_NEW,
@@ -3181,7 +3181,7 @@ int btrfs_search_slot_for_read(struct btrfs_root *root, 
			       int find_higher, int return_any);

int btrfs_realloc_node(struct btrfs_trans_handle *trans,

		       struct btrfs_root *root, struct extent_buffer *parent,

		       int start_slot, int cache_only, u64 *last_ret,

		       int start_slot, u64 *last_ret,

		       struct btrfs_key *progress);

void btrfs_release_path(struct btrfs_path *p);

struct btrfs_path *btrfs_alloc_path(void);
@@ -3576,7 +3576,7 @@ int btrfs_dirty_pages(struct btrfs_root *root, struct inode *inode, 


/* tree-defrag.c */

int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,

			struct btrfs_root *root, int cache_only);

			struct btrfs_root *root);



/* sysfs.c */

int btrfs_init_sysfs(void);

fs/btrfs/ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ static int find_new_extents(struct btrfs_root *root, 


	while(1) {

		ret = btrfs_search_forward(root, &min_key, &max_key,

					   path, 0, newer_than);

					   path, newer_than);

		if (ret != 0)

			goto none;

		if (min_key.objectid != ino)
@@ -1864,7 +1864,7 @@ static noinline int search_ioctl(struct inode *inode, 
	path->keep_locks = 1;



	while(1) {

		ret = btrfs_search_forward(root, &key, &max_key, path, 0,

		ret = btrfs_search_forward(root, &key, &max_key, path,

					   sk->min_transid);

		if (ret != 0) {

			if (ret > 0)
@@ -2212,10 +2212,10 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) 
			ret = -EPERM;

			goto out;

		}

		ret = btrfs_defrag_root(root, 0);

		ret = btrfs_defrag_root(root);

		if (ret)

			goto out;

		ret = btrfs_defrag_root(root->fs_info->extent_root, 0);

		ret = btrfs_defrag_root(root->fs_info->extent_root);

		break;

	case S_IFREG:

		if (!(file->f_mode & FMODE_WRITE)) {

fs/btrfs/transaction.c

+4 −4
Original line number Diff line number Diff line
@@ -959,10 +959,10 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans, 
}



/*

 * defrag a given btree.  If cacheonly == 1, this won't read from the disk,

 * otherwise every leaf in the btree is read and defragged.

 * defrag a given btree.

 * Every leaf in the btree is read and defragged.

 */

int btrfs_defrag_root(struct btrfs_root *root, int cacheonly)

int btrfs_defrag_root(struct btrfs_root *root)

{

	struct btrfs_fs_info *info = root->fs_info;

	struct btrfs_trans_handle *trans;
@@ -976,7 +976,7 @@ int btrfs_defrag_root(struct btrfs_root *root, int cacheonly) 
		if (IS_ERR(trans))

			return PTR_ERR(trans);



		ret = btrfs_defrag_leaves(trans, root, cacheonly);

		ret = btrfs_defrag_leaves(trans, root);



		btrfs_end_transaction(trans, root);

		btrfs_btree_balance_dirty(info->tree_root);

fs/btrfs/transaction.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, 
				     struct btrfs_root *root);



int btrfs_add_dead_root(struct btrfs_root *root);

int btrfs_defrag_root(struct btrfs_root *root, int cacheonly);

int btrfs_defrag_root(struct btrfs_root *root);

int btrfs_clean_old_snapshots(struct btrfs_root *root);

int btrfs_commit_transaction(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root);