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

Commit e8dfc305 authored by Wu Fengguang's avatar Wu Fengguang
Browse files

writeback: elevate queue_io() into wb_writeback() 



Code refactor for more logical code layout.
No behavior change.

- remove the mis-named __writeback_inodes_sb()

- wb_writeback()/writeback_inodes_wb() will decide when to queue_io()
  before calling __writeback_inodes_wb()

Acked-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
parent f758eeab

fs/fs-writeback.c

+12 −17
Original line number Original line Diff line number Diff line
@@ -580,17 +580,13 @@ static int writeback_sb_inodes(struct super_block *sb, struct bdi_writeback *wb, 
	return 1;

	return 1;

}

}





void writeback_inodes_wb(struct bdi_writeback *wb,

static void __writeback_inodes_wb(struct bdi_writeback *wb,

				  struct writeback_control *wbc)

				  struct writeback_control *wbc)

{

{

	int ret = 0;

	int ret = 0;





	if (!wbc->wb_start)

	if (!wbc->wb_start)

		wbc->wb_start = jiffies; /* livelock avoidance */

		wbc->wb_start = jiffies; /* livelock avoidance */

	spin_lock(&wb->list_lock);



	if (list_empty(&wb->b_io))

		queue_io(wb, wbc->older_than_this);





	while (!list_empty(&wb->b_io)) {

	while (!list_empty(&wb->b_io)) {

		struct inode *inode = wb_inode(wb->b_io.prev);

		struct inode *inode = wb_inode(wb->b_io.prev);
@@ -606,19 +602,16 @@ void writeback_inodes_wb(struct bdi_writeback *wb, 
		if (ret)

		if (ret)

			break;

			break;

	}

	}

	spin_unlock(&wb->list_lock);

	/* Leave any unwritten inodes on b_io */

	/* Leave any unwritten inodes on b_io */

}

}





static void __writeback_inodes_sb(struct super_block *sb,

void writeback_inodes_wb(struct bdi_writeback *wb,

		struct bdi_writeback *wb, struct writeback_control *wbc)

		struct writeback_control *wbc)

{

{

	WARN_ON(!rwsem_is_locked(&sb->s_umount));



	spin_lock(&wb->list_lock);

	spin_lock(&wb->list_lock);

	if (list_empty(&wb->b_io))

	if (list_empty(&wb->b_io))

		queue_io(wb, wbc->older_than_this);

		queue_io(wb, wbc->older_than_this);

	writeback_sb_inodes(sb, wb, wbc, true);

	__writeback_inodes_wb(wb, wbc);

	spin_unlock(&wb->list_lock);

	spin_unlock(&wb->list_lock);

}

}
@@ -685,7 +678,7 @@ static long wb_writeback(struct bdi_writeback *wb, 
	 * The intended call sequence for WB_SYNC_ALL writeback is:

	 * The intended call sequence for WB_SYNC_ALL writeback is:

	 *

	 *

	 *      wb_writeback()

	 *      wb_writeback()

	 *          __writeback_inodes_sb()     <== called only once

	 *          writeback_sb_inodes()       <== called only once

	 *              write_cache_pages()     <== called once for each inode

	 *              write_cache_pages()     <== called once for each inode

	 *                   (quickly) tag currently dirty pages

	 *                   (quickly) tag currently dirty pages

	 *                   (maybe slowly) sync all tagged pages

	 *                   (maybe slowly) sync all tagged pages
@@ -694,6 +687,7 @@ static long wb_writeback(struct bdi_writeback *wb, 
		write_chunk = LONG_MAX;

		write_chunk = LONG_MAX;





	wbc.wb_start = jiffies; /* livelock avoidance */

	wbc.wb_start = jiffies; /* livelock avoidance */

	spin_lock(&wb->list_lock);

	for (;;) {

	for (;;) {

		/*

		/*

		 * Stop writeback when nr_pages has been consumed

		 * Stop writeback when nr_pages has been consumed
@@ -730,10 +724,12 @@ static long wb_writeback(struct bdi_writeback *wb, 
		wbc.inodes_written = 0;

		wbc.inodes_written = 0;





		trace_wbc_writeback_start(&wbc, wb->bdi);

		trace_wbc_writeback_start(&wbc, wb->bdi);

		if (list_empty(&wb->b_io))

			queue_io(wb, wbc.older_than_this);

		if (work->sb)

		if (work->sb)

			__writeback_inodes_sb(work->sb, wb, &wbc);

			writeback_sb_inodes(work->sb, wb, &wbc, true);

		else

		else

			writeback_inodes_wb(wb, &wbc);

			__writeback_inodes_wb(wb, &wbc);

		trace_wbc_writeback_written(&wbc, wb->bdi);

		trace_wbc_writeback_written(&wbc, wb->bdi);





		work->nr_pages -= write_chunk - wbc.nr_to_write;

		work->nr_pages -= write_chunk - wbc.nr_to_write;
@@ -761,7 +757,6 @@ static long wb_writeback(struct bdi_writeback *wb, 
		 * become available for writeback. Otherwise

		 * become available for writeback. Otherwise

		 * we'll just busyloop.

		 * we'll just busyloop.

		 */

		 */

		spin_lock(&wb->list_lock);

		if (!list_empty(&wb->b_more_io))  {

		if (!list_empty(&wb->b_more_io))  {

			inode = wb_inode(wb->b_more_io.prev);

			inode = wb_inode(wb->b_more_io.prev);

			trace_wbc_writeback_wait(&wbc, wb->bdi);

			trace_wbc_writeback_wait(&wbc, wb->bdi);
@@ -769,8 +764,8 @@ static long wb_writeback(struct bdi_writeback *wb, 
			inode_wait_for_writeback(inode, wb);

			inode_wait_for_writeback(inode, wb);

			spin_unlock(&inode->i_lock);

			spin_unlock(&inode->i_lock);

		}

		}

		spin_unlock(&wb->list_lock);

	}

	}

	spin_unlock(&wb->list_lock);





	return wrote;

	return wrote;

}

}