diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-13 15:23:44 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-03 18:35:06 -0500 |
commit | 8e0969f0451eaf7cf32f2ec3946196d8d0b1cb2c (patch) | |
tree | 66f3e1ca0761d77e21ac3d24bacc1574189cfc64 /fs/nfs/proc.c | |
parent | c228fd3aeef55637354167faead74c579d5da28b (diff) |
NFS: Remove nfs_readpage_sync()
It makes no sense to maintain 2 parallel systems for reading in pages.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/proc.c')
-rw-r--r-- | fs/nfs/proc.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index 560536ad74a4..1dcf56de9482 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c | |||
@@ -186,35 +186,6 @@ static int nfs_proc_readlink(struct inode *inode, struct page *page, | |||
186 | return status; | 186 | return status; |
187 | } | 187 | } |
188 | 188 | ||
189 | static int nfs_proc_read(struct nfs_read_data *rdata) | ||
190 | { | ||
191 | int flags = rdata->flags; | ||
192 | struct inode * inode = rdata->inode; | ||
193 | struct nfs_fattr * fattr = rdata->res.fattr; | ||
194 | struct rpc_message msg = { | ||
195 | .rpc_proc = &nfs_procedures[NFSPROC_READ], | ||
196 | .rpc_argp = &rdata->args, | ||
197 | .rpc_resp = &rdata->res, | ||
198 | .rpc_cred = rdata->cred, | ||
199 | }; | ||
200 | int status; | ||
201 | |||
202 | dprintk("NFS call read %d @ %Ld\n", rdata->args.count, | ||
203 | (long long) rdata->args.offset); | ||
204 | nfs_fattr_init(fattr); | ||
205 | status = rpc_call_sync(NFS_CLIENT(inode), &msg, flags); | ||
206 | if (status >= 0) { | ||
207 | nfs_refresh_inode(inode, fattr); | ||
208 | /* Emulate the eof flag, which isn't normally needed in NFSv2 | ||
209 | * as it is guaranteed to always return the file attributes | ||
210 | */ | ||
211 | if (rdata->args.offset + rdata->args.count >= fattr->size) | ||
212 | rdata->res.eof = 1; | ||
213 | } | ||
214 | dprintk("NFS reply read: %d\n", status); | ||
215 | return status; | ||
216 | } | ||
217 | |||
218 | static int | 189 | static int |
219 | nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | 190 | nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, |
220 | int flags, struct nameidata *nd) | 191 | int flags, struct nameidata *nd) |
@@ -666,7 +637,6 @@ const struct nfs_rpc_ops nfs_v2_clientops = { | |||
666 | .lookup = nfs_proc_lookup, | 637 | .lookup = nfs_proc_lookup, |
667 | .access = NULL, /* access */ | 638 | .access = NULL, /* access */ |
668 | .readlink = nfs_proc_readlink, | 639 | .readlink = nfs_proc_readlink, |
669 | .read = nfs_proc_read, | ||
670 | .create = nfs_proc_create, | 640 | .create = nfs_proc_create, |
671 | .remove = nfs_proc_remove, | 641 | .remove = nfs_proc_remove, |
672 | .unlink_setup = nfs_proc_unlink_setup, | 642 | .unlink_setup = nfs_proc_unlink_setup, |