diff options
| author | Akira Fujita <a-fujita@rs.jp.nec.com> | 2011-10-20 18:56:10 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-10-20 18:56:10 -0400 |
| commit | 09e0834fb0ce1ea2a63885177015bd5d7d2bc22d (patch) | |
| tree | 52f8efc4bd21cc93d27cfb9071decc6996065071 /fs | |
| parent | ee90d57e20bd4749dda3b14397392b18b89dc3ef (diff) | |
| download | blackbird-obmc-linux-09e0834fb0ce1ea2a63885177015bd5d7d2bc22d.tar.gz blackbird-obmc-linux-09e0834fb0ce1ea2a63885177015bd5d7d2bc22d.zip | |
ext4: fix deadlock in ext4_ordered_write_end()
If ext4_jbd2_file_inode() in ext4_ordered_write_end() fails for some
reasons, this function returns to caller without unlocking the page.
It leads to the deadlock, and the patch fixes this issue.
Signed-off-by: Akira Fujita <a-fujita@rs.jp.nec.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 081bb25a9ad3..ecb572591924 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -959,7 +959,11 @@ static int ext4_ordered_write_end(struct file *file, ext4_orphan_add(handle, inode); if (ret2 < 0) ret = ret2; + } else { + unlock_page(page); + page_cache_release(page); } + ret2 = ext4_journal_stop(handle); if (!ret) ret = ret2; |
