瀏覽代碼

ext4: mark multi-page IO complete on mapping failure

In mpage_da_map_and_submit(), if we have a delayed block
allocation failure from ext4_map_blocks(), we need to mark
the IO as complete, by setting

      mpd->io_done = 1;

Otherwise, we could end up submitting the pages in an outer
loop; since they are unlocked on mapping failure in
ext4_da_block_invalidatepages(), this will cause a bug check
in mpage_da_submit_io().

I tested this by injected failures into ext4_map_blocks().
Without this patch, a simple fsstress run will bug check;
with the patch, it works fine.

Signed-off-by: Curt Wohlgemuth <curtw@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Curt Wohlgemuth 14 年之前
父節點
當前提交
e0fd9b9076
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      fs/ext4/inode.c

+ 3 - 0
fs/ext4/inode.c

@@ -2314,6 +2314,9 @@ static void mpage_da_map_and_submit(struct mpage_da_data *mpd)
 		/* invalidate all the pages */
 		/* invalidate all the pages */
 		ext4_da_block_invalidatepages(mpd, next,
 		ext4_da_block_invalidatepages(mpd, next,
 				mpd->b_size >> mpd->inode->i_blkbits);
 				mpd->b_size >> mpd->inode->i_blkbits);
+
+		/* Mark this page range as having been completed */
+		mpd->io_done = 1;
 		return;
 		return;
 	}
 	}
 	BUG_ON(blks == 0);
 	BUG_ON(blks == 0);