The patch titled
Fix for patch ecdfc9787fe527491baefc22dce8b2dbd5b2908d
has been added to the -mm tree. Its filename is
fix-for-patch-ecdfc9787fe527491baefc22dce8b2dbd5b2908d.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix for patch ecdfc9787fe527491baefc22dce8b2dbd5b2908d
From: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
__set_page_dirty_buffers() | try_to_free_buffers()
---------------------------+---------------------------
| spin_lock(private_lock);
| drop_bufers()
| spin_unlock(private_lock);
spin_lock(private_lock) |
!page_has_buffers() |
spin_unlock(private_lock) |
SetPageDirty() |
| cancel_dirty_page()
oops!
Signed-off-by: Nick Piggin <npiggin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/buffer.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff -puN fs/buffer.c~fix-for-patch-ecdfc9787fe527491baefc22dce8b2dbd5b2908d fs/buffer.c
--- a/fs/buffer.c~fix-for-patch-ecdfc9787fe527491baefc22dce8b2dbd5b2908d
+++ a/fs/buffer.c
@@ -2844,7 +2844,6 @@ int try_to_free_buffers(struct page *pag
spin_lock(&mapping->private_lock);
ret = drop_buffers(page, &buffers_to_free);
- spin_unlock(&mapping->private_lock);
/*
* If the filesystem writes its buffers by hand (eg ext3)
@@ -2855,9 +2854,14 @@ int try_to_free_buffers(struct page *pag
* Also, during truncate, discard_buffer will have marked all
* the page's buffers clean. We discover that here and clean
* the page also.
+ *
+ * private_lock must be held over this entire operation in order
+ * to synchronise against __set_page_dirty_buffers and prevent the
+ * dirty bit from being lost.
*/
if (ret)
cancel_dirty_page(page, PAGE_CACHE_SIZE);
+ spin_unlock(&mapping->private_lock);
out:
if (buffers_to_free) {
struct buffer_head *bh = buffers_to_free;
_
Patches currently in -mm which might be from nickpiggin@xxxxxxxxxxxx are
origin.patch
fix-via-irq-quirk-breakage.patch
fix-for-patch-ecdfc9787fe527491baefc22dce8b2dbd5b2908d.patch
mm-show-bounce-pages-in-oom-killer-output.patch
page_mkwrite-race-fix.patch
cpuset-remove-sched-domain-hooks-from-cpusets.patch
kblockd-use-flush_work.patch
mm-only-sched-add-a-few-scheduler-event-counters.patch
sched2-sched-domain-sysctl.patch
sched2-sched-domain-sysctl-use-ctl_unnumbered.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
