2011-10-13 02:06:31

by Akira Fujita

Subject: [PATCH] ext4: fix the deadlock in ext4_ordered_write_end()

From: Akira Fujita <[email protected]>

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 <[email protected]>
---
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 986e238..69dc2c6 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -909,7 +909,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;

2011-10-21 01:12:45

by Theodore Ts'o

Subject: Re: [PATCH] ext4: fix the deadlock in ext4_ordered_write_end()

On Thu, Oct 13, 2011 at 11:05:52AM +0900, Akira Fujita wrote:
> From: Akira Fujita <[email protected]>
>
> 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 <[email protected]>

Thanks, applied.

- Ted