mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Trond Myklebust <Trond.Myklebust@netapp.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Florin Iucha <florin@iucha.net>,
	Andrew Morton <akpm@linux-foundation.org>,
	Adrian Bunk <bunk@stusta.de>,
	OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>,
	Chuck Lever <chuck.lever@oracle.com>,
	linux-kernel@vger.kernel.org, nfs@lists.sourceforge.net
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	[thread overview]
Message-ID: <20070420201239.7897.74094.stgit@heimdal.trondhjem.org> (raw)
In-Reply-To: <20070420200358.7897.75870.stgit@heimdal.trondhjem.org>

From: Trond Myklebust <Trond.Myklebust@netapp.com>

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 <Trond.Myklebust@netapp.com>
---

 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;

  parent reply	other threads:[~2007-04-20 20:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-20 20:03 [PATCH 0/5] 2.6.21-rc7 NFS writes: fix a series of issues Trond Myklebust
2007-04-20 20:12 ` [PATCH 1/5] NFS: clean up the unstable write code Trond Myklebust
2007-04-20 20:12 ` Trond Myklebust [this message]
2007-04-20 20:12 ` [PATCH 3/5] NFS: Fix the 'desynchronized value of nfs_i.ncommit' error Trond Myklebust
2007-04-20 20:12 ` [PATCH 4/5] NFS: Fix race in nfs_set_page_dirty Trond Myklebust
2007-04-20 20:12 ` [PATCH 5/5] RPC: Fix the TCP resend semantics for NFSv4 Trond Myklebust
2007-04-21 14:43 ` [PATCH 0/5] 2.6.21-rc7 NFS writes: fix a series of issues Florin Iucha

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070420201239.7897.74094.stgit@heimdal.trondhjem.org \
    --to=trond.myklebust@netapp.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=akpm@linux-foundation.org \
    --cc=bunk@stusta.de \
    --cc=chuck.lever@oracle.com \
    --cc=florin@iucha.net \
    --cc=hirofumi@mail.parknet.co.jp \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nfs@lists.sourceforge.net \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®