summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2007-05-07 01:49:05 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 23:12:51 +0400
commit3d67f2d7c0fb28b0eb6a6aa100b190526a971ad9 (patch)
treeeea6afc9610ba15218c9f03aa6091ec687a39577
parent6fe6900e1e5b6fa9e5c59aa5061f244fe3f467e2 (diff)
downloadlinux-3d67f2d7c0fb28b0eb6a6aa100b190526a971ad9.tar.xz
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: Nick Piggin <npiggin@suse.de> Cc: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/buffer.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 1d0852fa728b..dcc5faa573ba 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1700,17 +1700,8 @@ done:
* clean. Someone wrote them back by hand with
* 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);
+
/*
* The page and buffer_heads can be released at any time from
* here on.