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

Commit f0de181c authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: kill delay_iput arg to the wait_ordered functions 



This is a left over of how we used to wait for ordered extents, which was to
grab the inode and then run filemap flush on it.  However if we have an ordered
extent then we already are holding a ref on the inode, and we just use
btrfs_start_ordered_extent anyway, so there is no reason to have an extra ref on
the inode to start work on the ordered extent.  Thanks,

Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent c4fbb430

fs/btrfs/dev-replace.c

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;

	btrfs_dev_replace_unlock(dev_replace);



	btrfs_wait_all_ordered_extents(root->fs_info, 0);

	btrfs_wait_all_ordered_extents(root->fs_info);



	/* force writing the updated state information to disk */

	trans = btrfs_start_transaction(root, 0);
@@ -475,7 +475,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);

		return ret;

	}

	btrfs_wait_all_ordered_extents(root->fs_info, 0);

	btrfs_wait_all_ordered_extents(root->fs_info);



	trans = btrfs_start_transaction(root, 0);

	if (IS_ERR(trans)) {

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -3991,7 +3991,7 @@ static void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root, 
		 */

		btrfs_start_all_delalloc_inodes(root->fs_info, 0);

		if (!current->journal_info)

			btrfs_wait_all_ordered_extents(root->fs_info, 0);

			btrfs_wait_all_ordered_extents(root->fs_info);

	}

}
@@ -4021,7 +4021,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, 
	if (delalloc_bytes == 0) {

		if (trans)

			return;

		btrfs_wait_all_ordered_extents(root->fs_info, 0);

		btrfs_wait_all_ordered_extents(root->fs_info);

		return;

	}
@@ -4049,7 +4049,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, 


		loops++;

		if (wait_ordered && !trans) {

			btrfs_wait_all_ordered_extents(root->fs_info, 0);

			btrfs_wait_all_ordered_extents(root->fs_info);

		} else {

			time_left = schedule_timeout_killable(1);

			if (time_left)

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, 
	if (ret)

		return ret;



	btrfs_wait_ordered_extents(root, 0);

	btrfs_wait_ordered_extents(root);



	pending_snapshot = kzalloc(sizeof(*pending_snapshot), GFP_NOFS);

	if (!pending_snapshot)

fs/btrfs/ordered-data.c

+3 −21
Original line number Diff line number Diff line
@@ -563,11 +563,10 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work) 
 * wait for all the ordered extents in a root.  This is done when balancing

 * space between drives.

 */

void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput)

void btrfs_wait_ordered_extents(struct btrfs_root *root)

{

	struct list_head splice, works;

	struct btrfs_ordered_extent *ordered, *next;

	struct inode *inode;



	INIT_LIST_HEAD(&splice);

	INIT_LIST_HEAD(&works);
@@ -580,15 +579,6 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput) 
					   root_extent_list);

		list_move_tail(&ordered->root_extent_list,

			       &root->ordered_extents);

		/*

		 * the inode may be getting freed (in sys_unlink path).

		 */

		inode = igrab(ordered->inode);

		if (!inode) {

			cond_resched_lock(&root->ordered_extent_lock);

			continue;

		}



		atomic_inc(&ordered->refs);

		spin_unlock(&root->ordered_extent_lock);
@@ -605,21 +595,13 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput) 
	list_for_each_entry_safe(ordered, next, &works, work_list) {

		list_del_init(&ordered->work_list);

		wait_for_completion(&ordered->completion);



		inode = ordered->inode;

		btrfs_put_ordered_extent(ordered);

		if (delay_iput)

			btrfs_add_delayed_iput(inode);

		else

			iput(inode);



		cond_resched();

	}

	mutex_unlock(&root->fs_info->ordered_operations_mutex);

}



void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info,

				    int delay_iput)

void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info)

{

	struct btrfs_root *root;

	struct list_head splice;
@@ -637,7 +619,7 @@ void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info, 
			       &fs_info->ordered_roots);

		spin_unlock(&fs_info->ordered_root_lock);



		btrfs_wait_ordered_extents(root, delay_iput);

		btrfs_wait_ordered_extents(root);

		btrfs_put_fs_root(root);



		spin_lock(&fs_info->ordered_root_lock);

fs/btrfs/ordered-data.h

+2 −3
Original line number Diff line number Diff line
@@ -195,9 +195,8 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans, 
void btrfs_add_ordered_operation(struct btrfs_trans_handle *trans,

				 struct btrfs_root *root,

				 struct inode *inode);

void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput);

void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info,

				    int delay_iput);

void btrfs_wait_ordered_extents(struct btrfs_root *root);

void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info);

void btrfs_get_logged_extents(struct btrfs_root *log, struct inode *inode);

void btrfs_wait_logged_extents(struct btrfs_root *log, u64 transid);

void btrfs_free_logged_extents(struct btrfs_root *log, u64 transid);