From 55a85b6caf6f533e0fdd56ccb3becce84558c8c4 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Sun, 10 Mar 2013 22:19:00 -0400 Subject: [PATCH] --- yaml --- r: 361591 b: refs/heads/master c: e1c36595bedc2e1b4112f01256cb30f4d9f9ae46 h: refs/heads/master i: 361589: bf6e737c8ff1243c031358b1128a431718d4611d 361587: 5aa1ef63d0a8d37d1f7350950cf8373bdda150be 361583: 2bd4fcb0ec72221625294ea92f8ecdb9ba77a2e0 v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 699e62384025..571cd06a9eb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a2256702e47f68f921dfad41b1764d05c572329 +refs/heads/master: e1c36595bedc2e1b4112f01256cb30f4d9f9ae46 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 4f1d54a88d8c..117a9e7aa4a0 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -3018,8 +3018,8 @@ static int ext4_releasepage(struct page *page, gfp_t wait) trace_ext4_releasepage(page); - WARN_ON(PageChecked(page)); - if (!page_has_buffers(page)) + /* Page has dirty journalled data -> cannot release */ + if (PageChecked(page)) return 0; if (journal) return jbd2_journal_try_to_free_buffers(journal, page, wait);