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);