Commit 23dc9c75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.2/writeback-2022-12-12' of git://git.kernel.dk/linux 

Pull writeback updates from Jens Axboe:

 - Sanity check adding freed inodes to lists (Jan)

 - Removal of an old unused define (Miaohe)

* tag 'for-6.2/writeback-2022-12-12' of git://git.kernel.dk/linux:
  writeback: remove obsolete macro EXPIRE_DIRTY_ATIME
  writeback: Add asserts for adding freed inode to lists
parents fe36bb87 23e188a1

fs/fs-writeback.c

+14 −3
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static bool inode_io_list_move_locked(struct inode *inode, 
{

	assert_spin_locked(&wb->list_lock);

	assert_spin_locked(&inode->i_lock);

	WARN_ON_ONCE(inode->i_state & I_FREEING);



	list_move(&inode->i_io_list, head);
@@ -280,6 +281,7 @@ static void inode_cgwb_move_to_attached(struct inode *inode, 
{

	assert_spin_locked(&wb->list_lock);

	assert_spin_locked(&inode->i_lock);

	WARN_ON_ONCE(inode->i_state & I_FREEING);



	inode->i_state &= ~I_SYNC_QUEUED;

	if (wb != &wb->bdi->wb)
@@ -1129,6 +1131,7 @@ static void inode_cgwb_move_to_attached(struct inode *inode, 
{

	assert_spin_locked(&wb->list_lock);

	assert_spin_locked(&inode->i_lock);

	WARN_ON_ONCE(inode->i_state & I_FREEING);



	inode->i_state &= ~I_SYNC_QUEUED;

	list_del_init(&inode->i_io_list);
@@ -1294,6 +1297,17 @@ static void redirty_tail_locked(struct inode *inode, struct bdi_writeback *wb) 
{

	assert_spin_locked(&inode->i_lock);



	inode->i_state &= ~I_SYNC_QUEUED;

	/*

	 * When the inode is being freed just don't bother with dirty list

	 * tracking. Flush worker will ignore this inode anyway and it will

	 * trigger assertions in inode_io_list_move_locked().

	 */

	if (inode->i_state & I_FREEING) {

		list_del_init(&inode->i_io_list);

		wb_io_lists_depopulated(wb);

		return;

	}

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

		struct inode *tail;
@@ -1302,7 +1316,6 @@ static void redirty_tail_locked(struct inode *inode, struct bdi_writeback *wb) 
			inode->dirtied_when = jiffies;

	}

	inode_io_list_move_locked(inode, wb, &wb->b_dirty);

	inode->i_state &= ~I_SYNC_QUEUED;

}



static void redirty_tail(struct inode *inode, struct bdi_writeback *wb)
@@ -1345,8 +1358,6 @@ static bool inode_dirtied_after(struct inode *inode, unsigned long t) 
	return ret;

}



#define EXPIRE_DIRTY_ATIME 0x0001



/*

 * Move expired (dirtied before dirtied_before) dirty inodes from

 * @delaying_queue to @dispatch_queue.