OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47a5c6f
)
NFS: Fix Oopsable condition in nfs_readpage_sync()
author
Trond Myklebust
<Trond.Myklebust@netapp.com>
Fri, 15 Sep 2006 20:03:45 +0000
(16:03 -0400)
committer
Trond Myklebust
<Trond.Myklebust@netapp.com>
Tue, 19 Sep 2006 15:54:39 +0000
(11:54 -0400)
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/read.c
patch
|
blob
|
history
diff --git
a/fs/nfs/read.c
b/fs/nfs/read.c
index
7a9ee00
..
f0aff82
100644
(file)
--- a/
fs/nfs/read.c
+++ b/
fs/nfs/read.c
@@
-204,9
+204,11
@@
static int nfs_readpage_sync(struct nfs_open_context *ctx, struct inode *inode,
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: