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

Commit 00f6b03b authored by Jan Kara's avatar Jan Kara Committed by Jaegeuk Kim
Browse files

writeback: Drop I_DIRTY_TIME_EXPIRE 



The only use of I_DIRTY_TIME_EXPIRE is to detect in
__writeback_single_inode() that inode got there because flush worker
decided it's time to writeback the dirty inode time stamps (either
because we are syncing or because of age). However we can detect this
directly in __writeback_single_inode() and there's no need for the
strange propagation with I_DIRTY_TIME_EXPIRE flag.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent c7cba792

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -5144,7 +5144,7 @@ static int other_inode_match(struct inode * inode, unsigned long ino, 
	    (inode->i_state & I_DIRTY_TIME)) {

		struct ext4_inode_info	*ei = EXT4_I(inode);



		inode->i_state &= ~(I_DIRTY_TIME | I_DIRTY_TIME_EXPIRED);

		inode->i_state &= ~I_DIRTY_TIME;

		spin_unlock(&inode->i_lock);



		spin_lock(&ei->i_raw_lock);

fs/fs-writeback.c

+11 −17
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ static bool inode_dirtied_after(struct inode *inode, unsigned long t) 
 */

static int move_expired_inodes(struct list_head *delaying_queue,

			       struct list_head *dispatch_queue,

			       int flags, unsigned long dirtied_before)

			       unsigned long dirtied_before)

{

	LIST_HEAD(tmp);

	struct list_head *pos, *node;
@@ -1125,8 +1125,6 @@ static int move_expired_inodes(struct list_head *delaying_queue, 
		list_move(&inode->i_io_list, &tmp);

		moved++;

		spin_lock(&inode->i_lock);

		if (flags & EXPIRE_DIRTY_ATIME)

			inode->i_state |= I_DIRTY_TIME_EXPIRED;

		inode->i_state |= I_SYNC_QUEUED;

		spin_unlock(&inode->i_lock);

		if (sb_is_blkdev_sb(inode->i_sb))
@@ -1174,11 +1172,11 @@ static void queue_io(struct bdi_writeback *wb, struct wb_writeback_work *work, 


	assert_spin_locked(&wb->list_lock);

	list_splice_init(&wb->b_more_io, &wb->b_io);

	moved = move_expired_inodes(&wb->b_dirty, &wb->b_io, 0, dirtied_before);

	moved = move_expired_inodes(&wb->b_dirty, &wb->b_io, dirtied_before);

	if (!work->for_sync)

		time_expire_jif = jiffies - dirtytime_expire_interval * HZ;

	moved += move_expired_inodes(&wb->b_dirty_time, &wb->b_io,

				     EXPIRE_DIRTY_ATIME, time_expire_jif);

				     time_expire_jif);

	if (moved)

		wb_io_lists_populated(wb);

	trace_writeback_queue_io(wb, work, dirtied_before, moved);
@@ -1354,18 +1352,14 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc) 
	spin_lock(&inode->i_lock);



	dirty = inode->i_state & I_DIRTY;

	if (inode->i_state & I_DIRTY_TIME) {

		if ((dirty & I_DIRTY_INODE) ||

		    wbc->sync_mode == WB_SYNC_ALL ||

		    unlikely(inode->i_state & I_DIRTY_TIME_EXPIRED) ||

		    unlikely(time_after(jiffies,

					(inode->dirtied_time_when +

					 dirtytime_expire_interval * HZ)))) {

			dirty |= I_DIRTY_TIME | I_DIRTY_TIME_EXPIRED;

	if ((inode->i_state & I_DIRTY_TIME) &&

	    ((dirty & I_DIRTY_INODE) ||

	     wbc->sync_mode == WB_SYNC_ALL || wbc->for_sync ||

	     time_after(jiffies, inode->dirtied_time_when +

			dirtytime_expire_interval * HZ))) {

		dirty |= I_DIRTY_TIME;

		trace_writeback_lazytime(inode);

	}

	} else

		inode->i_state &= ~I_DIRTY_TIME_EXPIRED;

	inode->i_state &= ~dirty;



	/*

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -2072,7 +2072,6 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp) 
#define I_DIO_WAKEUP		(1 << __I_DIO_WAKEUP)

#define I_LINKABLE		(1 << 10)

#define I_DIRTY_TIME		(1 << 11)

#define I_DIRTY_TIME_EXPIRED	(1 << 12)

#define I_WB_SWITCH		(1 << 13)

#define I_OVL_INUSE		(1 << 14)

#define I_CREATING		(1 << 15)

include/trace/events/writeback.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
		{I_CLEAR,		"I_CLEAR"},		\

		{I_SYNC,		"I_SYNC"},		\

		{I_DIRTY_TIME,		"I_DIRTY_TIME"},	\

		{I_DIRTY_TIME_EXPIRED,	"I_DIRTY_TIME_EXPIRED"}, \

		{I_REFERENCED,		"I_REFERENCED"}		\

	)