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

Commit ae1b7f7d authored by Wu Fengguang's avatar Wu Fengguang Committed by Jens Axboe
Browse files

writeback: cleanup writeback_single_inode() 



Make the if-else straight in writeback_single_inode().
No behavior change.

Cc: Jan Kara <jack@suse.cz>
Cc: Michael Rubin <mrubin@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarFengguang Wu <wfg@mail.ustc.edu.cn>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 7fbdea32

fs/fs-writeback.c

+7 −8
Original line number Diff line number Diff line
@@ -449,8 +449,13 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc) 
	spin_lock(&inode_lock);

	inode->i_state &= ~I_SYNC;

	if (!(inode->i_state & (I_FREEING | I_CLEAR))) {

		if (!(inode->i_state & I_DIRTY) &&

		    mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {

		if (inode->i_state & I_DIRTY) {

			/*

			 * Someone redirtied the inode while were writing back

			 * the pages.

			 */

			redirty_tail(inode);

		} else if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {

			/*

			 * We didn't write back all the pages.  nfs_writepages()

			 * sometimes bales out without doing anything. Redirty
@@ -494,12 +499,6 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc) 
				inode->i_state |= I_DIRTY_PAGES;

				redirty_tail(inode);

			}

		} else if (inode->i_state & I_DIRTY) {

			/*

			 * Someone redirtied the inode while were writing back

			 * the pages.

			 */

			redirty_tail(inode);

		} else if (atomic_read(&inode->i_count)) {

			/*

			 * The inode is clean, inuse