aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-13 15:23:44 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-02-03 18:35:06 -0500
commit8e0969f0451eaf7cf32f2ec3946196d8d0b1cb2c (patch)
tree66f3e1ca0761d77e21ac3d24bacc1574189cfc64 /fs/nfs/nfs4proc.c
parentc228fd3aeef55637354167faead74c579d5da28b (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/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c39
1 files changed, 0 insertions, 39 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 665859214fa2..5b2446173dd8 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1734,44 +1734,6 @@ static int nfs4_proc_readlink(struct inode *inode, struct page *page,
1734 return err; 1734 return err;
1735} 1735}
1736 1736
1737static int _nfs4_proc_read(struct nfs_read_data *rdata)
1738{
1739 int flags = rdata->flags;
1740 struct inode *inode = rdata->inode;
1741 struct nfs_fattr *fattr = rdata->res.fattr;
1742 struct nfs_server *server = NFS_SERVER(inode);
1743 struct rpc_message msg = {
1744 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ],
1745 .rpc_argp = &rdata->args,
1746 .rpc_resp = &rdata->res,
1747 .rpc_cred = rdata->cred,
1748 };
1749 unsigned long timestamp = jiffies;
1750 int status;
1751
1752 dprintk("NFS call read %d @ %Ld\n", rdata->args.count,
1753 (long long) rdata->args.offset);
1754
1755 nfs_fattr_init(fattr);
1756 status = rpc_call_sync(server->client, &msg, flags);
1757 if (!status)
1758 renew_lease(server, timestamp);
1759 dprintk("NFS reply read: %d\n", status);
1760 return status;
1761}
1762
1763static int nfs4_proc_read(struct nfs_read_data *rdata)
1764{
1765 struct nfs4_exception exception = { };
1766 int err;
1767 do {
1768 err = nfs4_handle_exception(NFS_SERVER(rdata->inode),
1769 _nfs4_proc_read(rdata),
1770 &exception);
1771 } while (exception.retry);
1772 return err;
1773}
1774
1775/* 1737/*
1776 * Got race? 1738 * Got race?
1777 * We will need to arrange for the VFS layer to provide an atomic open. 1739 * We will need to arrange for the VFS layer to provide an atomic open.
@@ -3643,7 +3605,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = {
3643 .lookup = nfs4_proc_lookup, 3605 .lookup = nfs4_proc_lookup,
3644 .access = nfs4_proc_access, 3606 .access = nfs4_proc_access,
3645 .readlink = nfs4_proc_readlink, 3607 .readlink = nfs4_proc_readlink,
3646 .read = nfs4_proc_read,
3647 .create = nfs4_proc_create, 3608 .create = nfs4_proc_create,
3648 .remove = nfs4_proc_remove, 3609 .remove = nfs4_proc_remove,
3649 .unlink_setup = nfs4_proc_unlink_setup, 3610 .unlink_setup = nfs4_proc_unlink_setup,