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

Commit 5a93a064 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: do not flush data workqueues in xfs_flush_buftarg 



When we call xfs_flush_buftarg (generally from sync or umount) it already
is too late to flush the data workqueues, as I/O completion is signalled
for them and we are thus already done with the data we would flush here.

There are places where flushing them might be useful, but the current
sync interface doesn't give us that opportunity.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent a9add83e

fs/xfs/xfs_buf.c

+1 −10
Original line number Diff line number Diff line
@@ -1623,13 +1623,6 @@ xfs_buf_delwri_promote( 
	spin_unlock(&btp->bt_delwri_lock);

}



STATIC void

xfs_buf_runall_queues(

	struct workqueue_struct	*queue)

{

	flush_workqueue(queue);

}



/*

 * Move as many buffers as specified to the supplied list

 * idicating if we skipped any buffers to prevent deadlocks.
@@ -1752,9 +1745,7 @@ xfs_flush_buftarg( 
	LIST_HEAD(wait_list);

	struct blk_plug plug;



	xfs_buf_runall_queues(xfsconvertd_workqueue);

	xfs_buf_runall_queues(xfsdatad_workqueue);

	xfs_buf_runall_queues(xfslogd_workqueue);

	flush_workqueue(xfslogd_workqueue);



	set_bit(XBT_FORCE_FLUSH, &target->bt_flags);

	pincount = xfs_buf_delwri_split(target, &tmp_list, 0);