Commit 600be30a authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: remove i_ioend_count 



Remove counter of pending io ends as it is unused.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 109811c2

fs/ext4/ext4.h

+1 −6
Original line number Diff line number Diff line
@@ -1024,13 +1024,8 @@ struct ext4_inode_info { 
	 * transaction reserved

	 */

	struct list_head i_rsv_conversion_list;

	/*

	 * Completed IOs that need unwritten extents handling and don't have

	 * transaction reserved

	 */

	atomic_t i_ioend_count;	/* Number of outstanding io_end structs */

	atomic_t i_unwritten; /* Nr. of inflight conversions pending */

	struct work_struct i_rsv_conversion_work;

	atomic_t i_unwritten; /* Nr. of inflight conversions pending */



	spinlock_t i_block_reservation_lock;

fs/ext4/inode.c

+0 −3
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ void ext4_evict_inode(struct inode *inode) 
		}

		truncate_inode_pages_final(&inode->i_data);



		WARN_ON(atomic_read(&EXT4_I(inode)->i_ioend_count));

		goto no_delete;

	}
@@ -228,8 +227,6 @@ void ext4_evict_inode(struct inode *inode) 
		ext4_begin_ordered_truncate(inode, 0);

	truncate_inode_pages_final(&inode->i_data);



	WARN_ON(atomic_read(&EXT4_I(inode)->i_ioend_count));



	/*

	 * Protect us against freezing - iput() caller didn't have to have any

	 * protection against it

fs/ext4/page-io.c

+0 −4
Original line number Diff line number Diff line
@@ -128,9 +128,6 @@ static void ext4_release_io_end(ext4_io_end_t *io_end) 
	BUG_ON(io_end->flag & EXT4_IO_END_UNWRITTEN);

	WARN_ON(io_end->handle);



	if (atomic_dec_and_test(&EXT4_I(io_end->inode)->i_ioend_count))

		wake_up_all(ext4_ioend_wq(io_end->inode));



	for (bio = io_end->bio; bio; bio = next_bio) {

		next_bio = bio->bi_private;

		ext4_finish_bio(bio);
@@ -265,7 +262,6 @@ ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags) 
{

	ext4_io_end_t *io = kmem_cache_zalloc(io_end_cachep, flags);

	if (io) {

		atomic_inc(&EXT4_I(inode)->i_ioend_count);

		io->inode = inode;

		INIT_LIST_HEAD(&io->list);

		atomic_set(&io->count, 1);

fs/ext4/super.c

+0 −1
Original line number Diff line number Diff line
@@ -942,7 +942,6 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) 
	spin_lock_init(&ei->i_completed_io_lock);

	ei->i_sync_tid = 0;

	ei->i_datasync_tid = 0;

	atomic_set(&ei->i_ioend_count, 0);

	atomic_set(&ei->i_unwritten, 0);

	INIT_WORK(&ei->i_rsv_conversion_work, ext4_end_io_rsv_work);

#ifdef CONFIG_EXT4_FS_ENCRYPTION