diff options
author | Nick Piggin <npiggin@suse.de> | 2007-05-06 17:49:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:51 -0400 |
commit | 3d67f2d7c0fb28b0eb6a6aa100b190526a971ad9 (patch) | |
tree | eea6afc9610ba15218c9f03aa6091ec687a39577 /fs | |
parent | 6fe6900e1e5b6fa9e5c59aa5061f244fe3f467e2 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/buffer.c | 11 |
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: | |||
1700 | * clean. Someone wrote them back by hand with | 1700 | * clean. Someone wrote them back by hand with |
1701 | * ll_rw_block/submit_bh. A rare case. | 1701 | * ll_rw_block/submit_bh. A rare case. |
1702 | */ | 1702 | */ |
1703 | int uptodate = 1; | ||
1704 | do { | ||
1705 | if (!buffer_uptodate(bh)) { | ||
1706 | uptodate = 0; | ||
1707 | break; | ||
1708 | } | ||
1709 | bh = bh->b_this_page; | ||
1710 | } while (bh != head); | ||
1711 | if (uptodate) | ||
1712 | SetPageUptodate(page); | ||
1713 | end_page_writeback(page); | 1703 | end_page_writeback(page); |
1704 | |||
1714 | /* | 1705 | /* |
1715 | * The page and buffer_heads can be released at any time from | 1706 | * The page and buffer_heads can be released at any time from |
1716 | * here on. | 1707 | * here on. |