The patch titled
NFS oops fix
has been removed from the -mm tree. Its filename is
nfs-oops-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: NFS oops fix
From: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
afaik we're still waiting for confirmation from Andre?
On Fri, 2006-09-15 at 14:40 +0200, Andre Noll wrote:
> On 09:31, Andre Noll wrote:
> > The following just happend to one of our 8-way Opteron cluster nodes
> > (nfs client version 3, solaris nfs server).
>
> The problem is still present in 2.6.18-rc7. This time it happend on a
> 2-processor Opteron machine:
>
> Pid: 945, comm: sge_execd Not tainted 2.6.18-rc7-tt64-6-g1883c5ab #4
> RIP: 0010:[<ffffffff80150cad>] [<ffffffff80150cad>] page_to_pfn+0x0/0x33
> RSP: 0018:ffff8100fac73bb0 EFLAGS: 00010283
> RAX: 0000000000000a57 RBX: 00000000000004ae RCX: 0000000000000a57
> RDX: ffff8100fac73bf0 RSI: ffff8101b9b1c540 RDI: 0000000000000000
> RBP: 00000000000005a9 R08: ffff8101f7aa31d0 R09: ffff8101f7aa3040
> R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000b52
> R13: ffff8100fac73bf8 R14: 0000000000002000 R15: ffff8101f7aa32e8
> FS: 00002b83ded037a0(0000) GS:ffff8101000dc540(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
> CR2: 0000000000000000 CR3: 00000000fad78000 CR4: 00000000000006a0
> Process sge_execd (pid: 945, threadinfo ffff8100fac72000, task ffff810004be5180)
> Stack: ffffffff801d6276 ffff8101fc4f0440 ffff8101b9b1c3c0 0000000000000a57
> ffff8101f7aa31d0 00000000000005a9 ffffffff801d64fc 0000000000000001
> ffff8101ffec2e18 0000000000000000 ffff8101f7aa31d0 ffff8101ffec2e18
> Call Trace:
> [<ffffffff801d6276>] nfs_readpage_truncate_uninitialised_page+0x76/0xeb
> [<ffffffff801d64fc>] nfs_readpage_sync+0x211/0x253
> [<ffffffff801d6f89>] nfs_readpage+0x118/0x151
> [<ffffffff8014c6fe>] do_generic_mapping_read+0x1ec/0x398
> [<ffffffff8014c8aa>] file_read_actor+0x0/0xd1
> [<ffffffff8014caf2>] __generic_file_aio_read+0x177/0x1b0
> [<ffffffff8014cb5f>] generic_file_aio_read+0x34/0x39
> [<ffffffff801cf3eb>] nfs_file_read+0x84/0x93
> [<ffffffff8016e0fc>] do_sync_read+0xc9/0x106
> [<ffffffff8013e5fd>] autoremove_wake_function+0x0/0x2e
> [<ffffffff8015bf32>] do_mmap_pgoff+0x5fd/0x6de
> [<ffffffff8016e1e6>] vfs_read+0xad/0x14c
> [<ffffffff8016e520>] sys_read+0x45/0x6e
> [<ffffffff80109726>] system_call+0x7e/0x83
Does the attached patch fix it?
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Cc: Andre Noll <maan@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/read.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff -puN fs/nfs/read.c~nfs-oops-fix fs/nfs/read.c
--- a/fs/nfs/read.c~nfs-oops-fix
+++ a/fs/nfs/read.c
@@ -204,9 +204,11 @@ static int nfs_readpage_sync(struct nfs_
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATIME;
spin_unlock(&inode->i_lock);
- nfs_readpage_truncate_uninitialised_page(rdata);
- if (rdata->res.eof || rdata->res.count == rdata->args.count)
+ if (rdata->res.eof || rdata->res.count == rdata->args.count) {
SetPageUptodate(page);
+ if (rdata->res.eof && count != 0)
+ memclear_highpage_flush(page, rdata->args.pgbase, count);
+ }
result = 0;
io_error:
_
Patches currently in -mm which might be from trond.myklebust@xxxxxxxxxx are
origin.patch
allow-file-systems-to-manually-d_move-inside-of-rename.patch
add-newline-to-nfs-dprintk.patch
git-ocfs2.patch
vfs-use-seek_set-cur.patch
fs-cache-provide-a-filesystem-specific-syncable-page-bit.patch
fs-cache-generic-filesystem-caching-facility.patch
fs-cache-release-page-private-in-failed-readahead.patch
fs-cache-make-kafs-use-fs-cache.patch
nfs-use-local-caching.patch
fs-cache-cachefiles-ia64-missing-copy_page-export.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem.patch
autofs-make-sure-all-dentries-refs-are-released-before-calling-kill_anon_super.patch
vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch
nfs-represent-64-bit-fileids-as-64-bit-inode-numbers-on-32-bit-systems.patch
restore-rogue-readahead-printk.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
