lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext4: fix the deadlock in mpage_da_map_and_submit()

Browse Source 
If ext4_jbd2_file_inode() in mpage_da_map_and_submit() fails due to
journal abort, this function returns to caller without unlocking the
page.  It leads to the deadlock, and the patch fixes this issue by
calling mpage_da_submit_io().

Signed-off-by: Kazuya Mio <k-mio@sx.jp.nec.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Kazuya Mio
2011-10-20 19:23:08 -04:00
committed by Theodore Ts'o
parent 09e0834fb0
commit 8de49e674a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/ext4/inode.c
View File

@@ -1552,9 +1552,11 @@ static void mpage_da_map_and_submit(struct mpage_da_data *mpd)
if (ext4_should_order_data(mpd->inode)) { if (ext4_should_order_data(mpd->inode)) {
err = ext4_jbd2_file_inode(handle, mpd->inode); err = ext4_jbd2_file_inode(handle, mpd->inode);
if (err) if (err) {
/* Only if the journal is aborted */ /* Only if the journal is aborted */
return; mpd->retval = err;
goto submit_io;
}
} }
} }
@@ -2294,11 +2296,12 @@ retry:
ret = 0; ret = 0;
} else if (ret == MPAGE_DA_EXTENT_TAIL) { } else if (ret == MPAGE_DA_EXTENT_TAIL) {
/* /*
* got one extent now try with * Got one extent now try with rest of the pages.
* rest of the pages * If mpd.retval is set -EIO, journal is aborted.
* So we don't need to write any more.
*/ */
pages_written += mpd.pages_written; pages_written += mpd.pages_written;
ret = 0; ret = mpd.retval;
io_done = 1; io_done = 1;
} else if (wbc->nr_to_write) } else if (wbc->nr_to_write)
/* /*