From: Trond Myklebust <Trond.Myklebust@netapp.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: linux-kernel@vger.kernel.org, nfs@lists.sourceforge.net
Subject: [PATCH 02/11] NFS: Fix oops in nfs_cancel_commit_list
Date: Thu, 19 Oct 2006 13:04:32 -0400 [thread overview]
Message-ID: <20061019170432.8171.94121.stgit@lade.trondhjem.org> (raw)
In-Reply-To: <20061019170432.8171.75076.stgit@lade.trondhjem.org>
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Fix two bugs:
- nfs_inode_remove_request will call nfs_clear_request, so we cannot
reference req->wb_page after it. Move the call to dec_zone_page_state so
that it occurs while req->wb_page is still valid.
- Calling nfs_clear_page_writeback is unnecessary since the radix tree
tags will have been cleared by the call to nfs_inode_remove_request.
Replace with a simple call to nfs_unlock_request.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---
fs/nfs/write.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index f6675d2..d80fa8c 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -588,10 +588,10 @@ static void nfs_cancel_commit_list(struc
while(!list_empty(head)) {
req = nfs_list_entry(head->next);
+ dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
nfs_list_remove_request(req);
nfs_inode_remove_request(req);
- dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- nfs_clear_page_writeback(req);
+ nfs_unlock_request(req);
}
}
next prev parent reply other threads:[~2006-10-19 17:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-19 17:04 [PATCH 01/11] NFSv4: Fix thinko in fs/nfs/super.c Trond Myklebust
2006-10-19 17:04 ` [PATCH 04/11] nfs4: initialize cl_ipaddr Trond Myklebust
2006-10-19 17:04 ` [PATCH 07/11] NFS: fix minor bug in new NFS symlink code Trond Myklebust
2006-10-20 4:25 ` Andrew Morton
2006-10-20 4:57 ` [NFS] " Chuck Lever
2006-10-19 17:04 ` [PATCH 08/11] NFS: __nfs_revalidate_inode() can use "inode" before checking it is non-NULL Trond Myklebust
2006-10-19 17:04 ` Trond Myklebust [this message]
2006-10-19 17:04 ` [PATCH 03/11] NFS: Fix error handling in nfs_direct_write_result() Trond Myklebust
2006-10-19 17:04 ` [PATCH 06/11] NFS: Deal with failure of invalidate_inode_pages2() Trond Myklebust
2006-10-19 17:04 ` [PATCH 10/11] SUNRPC: fix race in in-kernel RPC portmapper client Trond Myklebust
2006-10-19 17:04 ` [PATCH 09/11] NFS: remove unused check in nfs4_open_revalidate Trond Myklebust
2006-10-19 17:04 ` [PATCH 05/11] NFS: Fix NFSv4 callback regression Trond Myklebust
2006-10-19 17:04 ` [PATCH 11/11] SUNRPC: fix a typo Trond Myklebust
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=20061019170432.8171.94121.stgit@lade.trondhjem.org \
--to=trond.myklebust@netapp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nfs@lists.sourceforge.net \
--cc=torvalds@osdl.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®