Commit e127b9bc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian Brauner
Browse files

fs: simplify invalidate_inodes 



kill_dirty has always been true for a long time, so hard code it and
remove the unused return value.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Message-Id: <20230811100828.1897174-18-hch@lst.de>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 38bcdd38

fs/inode.c

+2 −15
Original line number Diff line number Diff line
@@ -752,16 +752,11 @@ EXPORT_SYMBOL_GPL(evict_inodes); 
/**

 * invalidate_inodes	- attempt to free all inodes on a superblock

 * @sb:		superblock to operate on

 * @kill_dirty: flag to guide handling of dirty inodes

 *

 * Attempts to free all inodes for a given superblock.  If there were any

 * busy inodes return a non-zero value, else zero.

 * If @kill_dirty is set, discard dirty inodes too, otherwise treat

 * them as busy.

 * Attempts to free all inodes (including dirty inodes) for a given superblock.

 */

int invalidate_inodes(struct super_block *sb, bool kill_dirty)

void invalidate_inodes(struct super_block *sb)

{

	int busy = 0;

	struct inode *inode, *next;

	LIST_HEAD(dispose);
@@ -773,14 +768,8 @@ int invalidate_inodes(struct super_block *sb, bool kill_dirty) 
			spin_unlock(&inode->i_lock);

			continue;

		}

		if (inode->i_state & I_DIRTY_ALL && !kill_dirty) {

			spin_unlock(&inode->i_lock);

			busy = 1;

			continue;

		}

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

			spin_unlock(&inode->i_lock);

			busy = 1;

			continue;

		}
@@ -798,8 +787,6 @@ int invalidate_inodes(struct super_block *sb, bool kill_dirty) 
	spin_unlock(&sb->s_inode_list_lock);



	dispose_list(&dispose);



	return busy;

}



/*

fs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ void lock_two_inodes(struct inode *inode1, struct inode *inode2, 
 * fs-writeback.c

 */

extern long get_nr_dirty_inodes(void);

extern int invalidate_inodes(struct super_block *, bool);

void invalidate_inodes(struct super_block *sb);



/*

 * dcache.c

fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ static void fs_bdev_mark_dead(struct block_device *bdev, bool surprise) 
	if (!surprise)

		sync_filesystem(sb);

	shrink_dcache_sb(sb);

	invalidate_inodes(sb, true);

	invalidate_inodes(sb);

	if (sb->s_op->shutdown)

		sb->s_op->shutdown(sb);