The patch titled
NFS: Fix oops in nfs_cancel_commit_list
has been added to the -mm tree. Its filename is
nfs-fix-oops-in-nfs_cancel_commit_list.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: NFS: Fix oops in nfs_cancel_commit_list
From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/write.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/nfs/write.c~nfs-fix-oops-in-nfs_cancel_commit_list fs/nfs/write.c
--- a/fs/nfs/write.c~nfs-fix-oops-in-nfs_cancel_commit_list
+++ a/fs/nfs/write.c
@@ -590,10 +590,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);
}
}
_
Patches currently in -mm which might be from Trond.Myklebust@xxxxxxxxxx are
nfsv4-fix-thinko-in-fs-nfs-superc.patch
nfs-fix-oops-in-nfs_cancel_commit_list.patch
nfs-fix-error-handling-in-nfs_direct_write_result.patch
nfs4-initialize-cl_ipaddr.patch
nfs-fix-nfsv4-callback-regression.patch
nfs-deal-with-failure-of-invalidate_inode_pages2.patch
nfs-fix-minor-bug-in-new-nfs-symlink-code.patch
nfs-__nfs_revalidate_inode-can-use-inode-before.patch
nfs-remove-unused-check-in-nfs4_open_revalidate.patch
sunrpc-fix-race-in-in-kernel-rpc-portmapper-client.patch
sunrpc-fix-a-typo.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
