Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4230030 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

writeback: don't propagate AOP_WRITEPAGE_ACTIVATE 



This is a writeback-internal marker but we're propagating it all the way back
to userspace!.

Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7a405079

mm/page-writeback.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -849,8 +849,10 @@ int write_cache_pages(struct address_space *mapping, 




			ret = (*writepage)(page, wbc, data);

			ret = (*writepage)(page, wbc, data);





			if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE))

			if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE)) {

				unlock_page(page);

				unlock_page(page);

				ret = 0;

			}

			if (ret || (--(wbc->nr_to_write) <= 0))

			if (ret || (--(wbc->nr_to_write) <= 0))

				done = 1;

				done = 1;

			if (wbc->nonblocking && bdi_write_congested(bdi)) {

			if (wbc->nonblocking && bdi_write_congested(bdi)) {