From 1a2a815b0ba96f04c402593409fe45b81907287c Mon Sep 17 00:00:00 2001 From: Akira Fujita Date: Thu, 20 Oct 2011 18:56:10 -0400 Subject: [PATCH] --- yaml --- r: 273146 b: refs/heads/master c: 09e0834fb0ce1ea2a63885177015bd5d7d2bc22d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0630b8977a78..3318ea335ddb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee90d57e20bd4749dda3b14397392b18b89dc3ef +refs/heads/master: 09e0834fb0ce1ea2a63885177015bd5d7d2bc22d diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 081bb25a9ad3..ecb572591924 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/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;