+1

fs/ext4/ext4.h

reviewed

··· 175 175 */ 176 176 #define EXT4_IO_END_UNWRITTEN 0x0001 177 177 #define EXT4_IO_END_ERROR 0x0002 178 178 + #define EXT4_IO_END_QUEUED 0x0004 178 179 179 180 struct ext4_io_page { 180 181 struct page *p_page;

-3

fs/ext4/inode.c

reviewed

··· 121 121 122 122 trace_ext4_evict_inode(inode); 123 123 124 124 - mutex_lock(&inode->i_mutex); 125 125 - ext4_flush_completed_IO(inode); 126 126 - mutex_unlock(&inode->i_mutex); 127 124 ext4_ioend_wait(inode); 128 125 129 126 if (inode->i_nlink) {

+17 -1

fs/ext4/page-io.c

reviewed

··· 142 142 unsigned long flags; 143 143 int ret; 144 144 145 145 - mutex_lock(&inode->i_mutex); 145 145 + if (!mutex_trylock(&inode->i_mutex)) { 146 146 + /* 147 147 + * Requeue the work instead of waiting so that the work 148 148 + * items queued after this can be processed. 149 149 + */ 150 150 + queue_work(EXT4_SB(inode->i_sb)->dio_unwritten_wq, &io->work); 151 151 + /* 152 152 + * To prevent the ext4-dio-unwritten thread from keeping 153 153 + * requeueing end_io requests and occupying cpu for too long, 154 154 + * yield the cpu if it sees an end_io request that has already 155 155 + * been requeued. 156 156 + */ 157 157 + if (io->flag & EXT4_IO_END_QUEUED) 158 158 + yield(); 159 159 + io->flag |= EXT4_IO_END_QUEUED; 160 160 + return; 161 161 + } 146 162 ret = ext4_end_io_nolock(io); 147 163 if (ret < 0) { 148 164 mutex_unlock(&inode->i_mutex);