Skip to content

Commit

Permalink
writeback: don't propagate AOP_WRITEPAGE_ACTIVATE
Browse files Browse the repository at this point in the history
This is a writeback-internal marker but we're propagating it all the way back
to userspace!.

Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
akpm00 authored and Linus Torvalds committed Oct 17, 2007
1 parent 7a40507 commit e423003
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion mm/page-writeback.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,8 +849,10 @@ int write_cache_pages(struct address_space *mapping,

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)) {
Expand Down

0 comments on commit e423003

Please sign in to comment.