File tree Expand file tree Collapse file tree 4 files changed +1
-14
lines changed Expand file tree Collapse file tree 4 files changed +1
-14
lines changed Original file line number Diff line number Diff line change @@ -1024,13 +1024,8 @@ struct ext4_inode_info {
10241024 * transaction reserved
10251025 */
10261026 struct list_head i_rsv_conversion_list ;
1027- /*
1028- * Completed IOs that need unwritten extents handling and don't have
1029- * transaction reserved
1030- */
1031- atomic_t i_ioend_count ; /* Number of outstanding io_end structs */
1032- atomic_t i_unwritten ; /* Nr. of inflight conversions pending */
10331027 struct work_struct i_rsv_conversion_work ;
1028+ atomic_t i_unwritten ; /* Nr. of inflight conversions pending */
10341029
10351030 spinlock_t i_block_reservation_lock ;
10361031
Original file line number Diff line number Diff line change @@ -216,7 +216,6 @@ void ext4_evict_inode(struct inode *inode)
216216 }
217217 truncate_inode_pages_final (& inode -> i_data );
218218
219- WARN_ON (atomic_read (& EXT4_I (inode )-> i_ioend_count ));
220219 goto no_delete ;
221220 }
222221
@@ -228,8 +227,6 @@ void ext4_evict_inode(struct inode *inode)
228227 ext4_begin_ordered_truncate (inode , 0 );
229228 truncate_inode_pages_final (& inode -> i_data );
230229
231- WARN_ON (atomic_read (& EXT4_I (inode )-> i_ioend_count ));
232-
233230 /*
234231 * Protect us against freezing - iput() caller didn't have to have any
235232 * protection against it
Original file line number Diff line number Diff line change @@ -128,9 +128,6 @@ static void ext4_release_io_end(ext4_io_end_t *io_end)
128128 BUG_ON (io_end -> flag & EXT4_IO_END_UNWRITTEN );
129129 WARN_ON (io_end -> handle );
130130
131- if (atomic_dec_and_test (& EXT4_I (io_end -> inode )-> i_ioend_count ))
132- wake_up_all (ext4_ioend_wq (io_end -> inode ));
133-
134131 for (bio = io_end -> bio ; bio ; bio = next_bio ) {
135132 next_bio = bio -> bi_private ;
136133 ext4_finish_bio (bio );
@@ -265,7 +262,6 @@ ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags)
265262{
266263 ext4_io_end_t * io = kmem_cache_zalloc (io_end_cachep , flags );
267264 if (io ) {
268- atomic_inc (& EXT4_I (inode )-> i_ioend_count );
269265 io -> inode = inode ;
270266 INIT_LIST_HEAD (& io -> list );
271267 atomic_set (& io -> count , 1 );
Original file line number Diff line number Diff line change @@ -942,7 +942,6 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
942942 spin_lock_init (& ei -> i_completed_io_lock );
943943 ei -> i_sync_tid = 0 ;
944944 ei -> i_datasync_tid = 0 ;
945- atomic_set (& ei -> i_ioend_count , 0 );
946945 atomic_set (& ei -> i_unwritten , 0 );
947946 INIT_WORK (& ei -> i_rsv_conversion_work , ext4_end_io_rsv_work );
948947#ifdef CONFIG_EXT4_FS_ENCRYPTION
You can’t perform that action at this time.
0 commit comments