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

Commit 9843b76a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

fs: skip I_FREEING inodes in writeback_sb_inodes 



Skip I_FREEING inodes just like I_WILL_FREE and I_NEW when walking the
writeback lists.  Currenly this can't happen, but once we move from
inode_lock to more fine grained locking we can have an inode that's
still on the writeback lists but has I_FREEING set, and we absolutely
need to skip it here, just like we do for all other inode list walks.

Based on a patch from Dave Chinner.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a0318786

fs/fs-writeback.c

+7 −2
Original line number Diff line number Diff line
@@ -487,10 +487,16 @@ static int writeback_sb_inodes(struct super_block *sb, struct bdi_writeback *wb, 
			return 0;

		}



		if (inode->i_state & (I_NEW | I_WILL_FREE)) {

		/*

		 * Don't bother with new inodes or inodes beeing freed, first

		 * kind does not need peridic writeout yet, and for the latter

		 * kind writeout is handled by the freer.

		 */

		if (inode->i_state & (I_NEW | I_FREEING | I_WILL_FREE)) {

			requeue_io(inode);

			continue;

		}



		/*

		 * Was this inode dirtied after sync_sb_inodes was called?

		 * This keeps sync from extra jobs and livelock.
@@ -498,7 +504,6 @@ static int writeback_sb_inodes(struct super_block *sb, struct bdi_writeback *wb, 
		if (inode_dirtied_after(inode, wbc->wb_start))

			return 1;



		BUG_ON(inode->i_state & I_FREEING);

		__iget(inode);

		pages_skipped = wbc->pages_skipped;

		writeback_single_inode(inode, wbc);