diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-10-16 23:18:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-16 08:12:43 -0800 |
| commit | 2e25e4331914ab9dc1cfaf2f162ef69e67a19c44 (patch) | |
| tree | 2270e37fe764220dc570931aa4b0fbbe67255fb5 | |
| parent | f8b98ff93bba351932c1acfc75435fe7bfe48294 (diff) | |
| download | lwn-2e25e4331914ab9dc1cfaf2f162ef69e67a19c44.tar.gz lwn-2e25e4331914ab9dc1cfaf2f162ef69e67a19c44.zip | |
writeback: don't propagate AOP_WRITEPAGE_ACTIVATE
patch e423003028183df54f039dfda8b58c49e78c89d7 in mainline.
This is a writeback-internal marker but we're propagating it all the way back
to userspace!.
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | mm/page-writeback.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 44720363374c..97ddc5879259 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -672,8 +672,10 @@ retry: ret = (*writepage)(page, wbc, data); - if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE)) + if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE)) { unlock_page(page); + ret = 0; + } if (ret || (--(wbc->nr_to_write) <= 0)) done = 1; if (wbc->nonblocking && bdi_write_congested(bdi)) { |