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

Commit 3d67f2d7 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

fs: buffer don't PageUptodate without page locked



__block_write_full_page is calling SetPageUptodate without the page locked.
This is unusual, but not incorrect, as PG_writeback is still set.

However the next patch will require that SetPageUptodate always be called with
the page locked.  Simply don't bother setting the page uptodate in this case
(it is unusual that the write path does such a thing anyway).  Instead just
leave it to the read side to bring the page uptodate when it notices that all
buffers are uptodate.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6fe6900e
Loading
Loading
Loading
Loading
+1 −10
Original line number Original line Diff line number Diff line
@@ -1700,17 +1700,8 @@ static int __block_write_full_page(struct inode *inode, struct page *page,
		 * clean.  Someone wrote them back by hand with
		 * clean.  Someone wrote them back by hand with
		 * ll_rw_block/submit_bh.  A rare case.
		 * ll_rw_block/submit_bh.  A rare case.
		 */
		 */
		int uptodate = 1;
		do {
			if (!buffer_uptodate(bh)) {
				uptodate = 0;
				break;
			}
			bh = bh->b_this_page;
		} while (bh != head);
		if (uptodate)
			SetPageUptodate(page);
		end_page_writeback(page);
		end_page_writeback(page);

		/*
		/*
		 * The page and buffer_heads can be released at any time from
		 * The page and buffer_heads can be released at any time from
		 * here on.
		 * here on.