aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
author\"Talpey, Thomas\ <Thomas.Talpey@netapp.com>2007-09-10 13:48:23 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:17:53 -0400
commit0896a725a1c5fdc8773a4d1ab0b73059507f5925 (patch)
treee8a44eecc411f0d117358752d8a2b80895d81bc0 /fs/nfs/client.c
parent4fa016eb248cac875541fa199af550a8aefa0e90 (diff)
NFS/SUNRPC: use transport protocol naming
Instead of an { address family, raw IP protocol number }-tuple, use the newly-defined RPC identifier when creating clients in the upper layers. Signed-off-by: Tom Talpey <tmt@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 2edcbca1a161..6f6755529788 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -23,6 +23,7 @@
23#include <linux/sunrpc/clnt.h> 23#include <linux/sunrpc/clnt.h>
24#include <linux/sunrpc/stats.h> 24#include <linux/sunrpc/stats.h>
25#include <linux/sunrpc/metrics.h> 25#include <linux/sunrpc/metrics.h>
26#include <linux/sunrpc/xprtsock.h>
26#include <linux/nfs_fs.h> 27#include <linux/nfs_fs.h>
27#include <linux/nfs_mount.h> 28#include <linux/nfs_mount.h>
28#include <linux/nfs4_mount.h> 29#include <linux/nfs4_mount.h>
@@ -340,7 +341,7 @@ static void nfs_init_timeout_values(struct rpc_timeout *to, int proto,
340 to->to_retries = 2; 341 to->to_retries = 2;
341 342
342 switch (proto) { 343 switch (proto) {
343 case IPPROTO_TCP: 344 case XPRT_TRANSPORT_TCP:
344 if (!to->to_initval) 345 if (!to->to_initval)
345 to->to_initval = 60 * HZ; 346 to->to_initval = 60 * HZ;
346 if (to->to_initval > NFS_MAX_TCP_TIMEOUT) 347 if (to->to_initval > NFS_MAX_TCP_TIMEOUT)
@@ -349,7 +350,7 @@ static void nfs_init_timeout_values(struct rpc_timeout *to, int proto,
349 to->to_maxval = to->to_initval + (to->to_increment * to->to_retries); 350 to->to_maxval = to->to_initval + (to->to_increment * to->to_retries);
350 to->to_exponential = 0; 351 to->to_exponential = 0;
351 break; 352 break;
352 case IPPROTO_UDP: 353 case XPRT_TRANSPORT_UDP:
353 default: 354 default:
354 if (!to->to_initval) 355 if (!to->to_initval)
355 to->to_initval = 11 * HZ / 10; 356 to->to_initval = 11 * HZ / 10;