From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1767242AbXDTUeL (ORCPT ); Fri, 20 Apr 2007 16:34:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1767251AbXDTUeL (ORCPT ); Fri, 20 Apr 2007 16:34:11 -0400 Received: from dh166.citi.umich.edu ([141.211.133.166]:47386 "EHLO heimdal.trondhjem.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1767242AbXDTUeK (ORCPT ); Fri, 20 Apr 2007 16:34:10 -0400 X-Greylist: delayed 1299 seconds by postgrey-1.27 at vger.kernel.org; Fri, 20 Apr 2007 16:34:10 EDT From: Trond Myklebust Subject: [PATCH 2/5] NFS: Don't clear PG_writeback until after we've processed unstable writes Date: Fri, 20 Apr 2007 16:12:40 -0400 To: Linus Torvalds Cc: Peter Zijlstra , Florin Iucha , Andrew Morton , Adrian Bunk , OGAWA Hirofumi , Chuck Lever , linux-kernel@vger.kernel.org, nfs@lists.sourceforge.net Message-Id: <20070420201239.7897.74094.stgit@heimdal.trondhjem.org> In-Reply-To: <20070420200358.7897.75870.stgit@heimdal.trondhjem.org> References: <20070420200358.7897.75870.stgit@heimdal.trondhjem.org> Content-Type: text/plain; charset=utf-8; format=fixed Content-Transfer-Encoding: 8bit User-Agent: StGIT/0.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust Ensure that we don't release the PG_writeback lock until after the page has either been redirtied, or queued on the nfs_inode 'commit' list. Signed-off-by: Trond Myklebust --- fs/nfs/write.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 3ed4feb..8e94246 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -920,8 +920,8 @@ out_bad: list_del(&data->pages); nfs_writedata_release(data); } - nfs_end_page_writeback(req->wb_page); nfs_redirty_request(req); + nfs_end_page_writeback(req->wb_page); nfs_clear_page_writeback(req); return -ENOMEM; } @@ -966,8 +966,8 @@ static int nfs_flush_one(struct inode *inode, struct list_head *head, int how) while (!list_empty(head)) { struct nfs_page *req = nfs_list_entry(head->next); nfs_list_remove_request(req); - nfs_end_page_writeback(req->wb_page); nfs_redirty_request(req); + nfs_end_page_writeback(req->wb_page); nfs_clear_page_writeback(req); } return -ENOMEM; @@ -1002,8 +1002,8 @@ out_err: while (!list_empty(head)) { req = nfs_list_entry(head->next); nfs_list_remove_request(req); - nfs_end_page_writeback(req->wb_page); nfs_redirty_request(req); + nfs_end_page_writeback(req->wb_page); nfs_clear_page_writeback(req); } return error;