From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751534AbXBFICf (ORCPT ); Tue, 6 Feb 2007 03:02:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751393AbXBFICf (ORCPT ); Tue, 6 Feb 2007 03:02:35 -0500 Received: from cantor.suse.de ([195.135.220.2]:56634 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbXBFIC1 (ORCPT ); Tue, 6 Feb 2007 03:02:27 -0500 From: Nick Piggin To: Linus Torvalds Cc: Hugh Dickins , Andrew Morton , Nick Piggin , Linux Kernel , Linux Memory Management , Linux Filesystems Message-Id: <20070206054947.21042.32493.sendpatchset@linux.site> In-Reply-To: <20070206054925.21042.50546.sendpatchset@linux.site> References: <20070206054925.21042.50546.sendpatchset@linux.site> Subject: [patch 2/3] fs: buffer don't PageUptodate without page locked Date: Tue, 6 Feb 2007 09:02:23 +0100 (CET) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org __block_write_full_page is calling SetPageUptodate without the page locked. This is unusual, but not incorrect, as PG_writeback is still set. However with the previous patch, this is now a problem: so don't bother setting the page uptodate in this case (it is weird 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 Index: linux-2.6/fs/buffer.c =================================================================== --- linux-2.6.orig/fs/buffer.c +++ linux-2.6/fs/buffer.c @@ -1679,6 +1679,7 @@ static int __block_write_full_page(struc */ BUG_ON(PageWriteback(page)); set_page_writeback(page); + unlock_page(page); do { struct buffer_head *next = bh->b_this_page; @@ -1688,7 +1689,6 @@ static int __block_write_full_page(struc } bh = next; } while (bh != head); - unlock_page(page); err = 0; done: @@ -1698,17 +1698,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. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Piggin Message-Id: <20070206054947.21042.32493.sendpatchset@linux.site> In-Reply-To: <20070206054925.21042.50546.sendpatchset@linux.site> References: <20070206054925.21042.50546.sendpatchset@linux.site> Subject: [patch 2/3] fs: buffer don't PageUptodate without page locked Date: Tue, 6 Feb 2007 09:02:23 +0100 (CET) Sender: owner-linux-mm@kvack.org Return-Path: To: Linus Torvalds Cc: Hugh Dickins , Andrew Morton , Nick Piggin , Linux Kernel , Linux Memory Management , Linux Filesystems List-ID: __block_write_full_page is calling SetPageUptodate without the page locked. This is unusual, but not incorrect, as PG_writeback is still set. However with the previous patch, this is now a problem: so don't bother setting the page uptodate in this case (it is weird 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 Index: linux-2.6/fs/buffer.c =================================================================== --- linux-2.6.orig/fs/buffer.c +++ linux-2.6/fs/buffer.c @@ -1679,6 +1679,7 @@ static int __block_write_full_page(struc */ BUG_ON(PageWriteback(page)); set_page_writeback(page); + unlock_page(page); do { struct buffer_head *next = bh->b_this_page; @@ -1688,7 +1689,6 @@ static int __block_write_full_page(struc } bh = next; } while (bh != head); - unlock_page(page); err = 0; done: @@ -1698,17 +1698,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. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org