From: Trond Myklebust <Trond.Myklebust@netapp.com>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Florin Iucha <florin@iucha.net>,
Andrew Morton <akpm@linux-foundation.org>,
Adrian Bunk <bunk@stusta.de>,
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] NFS: Don't clear PG_writeback until after we've processed unstable writes
Date: Tue, 17 Apr 2007 21:29:31 -0400 [thread overview]
Message-ID: <20070418012931.11679.60451.stgit@heimdal.trondhjem.org> (raw)
In-Reply-To: <20070418011946.11679.34920.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;
next prev parent reply other threads:[~2007-04-18 1:48 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070416125905.GA2769@iucha.net>
[not found] ` <1176736734.6761.45.camel@heimdal.trondhjem.org>
[not found] ` <Pine.LNX.4.64.0704160904560.5473@woody.linux-foundation.org>
[not found] ` <1176740307.6761.56.camel@heimdal.trondhjem.org>
[not found] ` <1176741408.6761.62.camel@heimdal.trondhjem.org>
[not found] ` <1176792399.3035.30.camel@twins>
[not found] ` <1176796503.3035.33.camel@twins>
2007-04-17 17:01 ` nfs: desynchronized value of nfs_i.ncommit OGAWA Hirofumi
2007-04-17 22:44 ` Trond Myklebust
2007-04-18 1:19 ` [PATCH 0/4] 2.6.21-rc7 NFS writes: fix a series of issues Trond Myklebust
2007-04-18 1:29 ` [PATCH 1/4] NFS: clean up the unstable write code Trond Myklebust
2007-04-18 1:29 ` Trond Myklebust [this message]
2007-04-18 1:29 ` [PATCH 3/4] NFS: Fix the 'desynchronized value of nfs_i.ncommit' error Trond Myklebust
2007-04-18 1:29 ` [PATCH 4/4] NFS: Fix race in nfs_set_page_dirty Trond Myklebust
2007-04-18 2:58 ` [PATCH 0/4] 2.6.21-rc7 NFS writes: fix a series of issues Andrew Morton
2007-04-18 3:06 ` Trond Myklebust
2007-04-18 3:30 ` Florin Iucha
2007-04-18 3:54 ` Trond Myklebust
2007-04-18 4:07 ` Florin Iucha
2007-04-18 4:13 ` Andrew Morton
2007-04-18 4:30 ` Florin Iucha
2007-04-18 5:14 ` Linus Torvalds
2007-04-18 5:26 ` Florin Iucha
2007-04-18 5:37 ` Andrew Morton
2007-04-18 12:38 ` Florin Iucha
2007-04-18 13:15 ` Trond Myklebust
2007-04-18 13:42 ` Florin Iucha
2007-04-18 14:11 ` Trond Myklebust
2007-04-18 14:17 ` Florin Iucha
2007-04-18 14:19 ` Trond Myklebust
2007-04-19 1:52 ` Florin Iucha
2007-04-19 2:45 ` Trond Myklebust
2007-04-19 4:38 ` Success! Was: " Florin Iucha
2007-04-19 15:12 ` Chuck Lever
2007-04-19 15:17 ` Trond Myklebust
2007-04-19 15:50 ` Florin Iucha
2007-04-19 16:09 ` Trond Myklebust
2007-04-19 19:58 ` Failure! " Florin Iucha
2007-04-19 21:30 ` Trond Myklebust
2007-04-19 21:49 ` Florin Iucha
2007-04-20 13:30 ` Success! Was: " Florin Iucha
2007-04-20 13:37 ` Trond Myklebust
2007-04-20 13:51 ` Florin Iucha
2007-04-18 14:14 ` Florin Iucha
2007-04-29 19:41 ` Rogier Wolff
2007-04-29 20:09 ` Peter Zijlstra
2007-04-18 11:38 ` Trond Myklebust
2007-04-18 9:54 ` OGAWA Hirofumi
2007-04-18 8:19 ` Peter Zijlstra
2007-04-18 16:41 ` Peter Zijlstra
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=20070418012931.11679.60451.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=florin@iucha.net \
--cc=hirofumi@mail.parknet.co.jp \
--cc=linux-kernel@vger.kernel.org \
--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®