ext4: remove i_ioend_count

Remove counter of pending io ends as it is unused.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 9f3156c38b16def87c020e58534f33d2db22eb0e..70b8e04095661484882615f00915f7b17664a279 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -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;
 

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c67c16e59a71e09492e83871435cfc31aafc3a83..971892d7c2133164afe1347456377996ec0f98b9 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -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

diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index 090b3498638e7a7282e2c9f1ff7426bc01153e21..349d7aa04fe70e1938456362474baa5a421cf390 100644 (file)
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -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);

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4d5756024e9803b5f679fd9aed4fe54c82f56e01..de02a9ef45dd90dbd2084e2b4fed4b2de0d4f736 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -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