aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fs/lockd/mon.c3
-rw-r--r--fs/nfs/client.c5
-rw-r--r--fs/nfs/nfsroot.c3
-rw-r--r--fs/nfs/super.c21
-rw-r--r--net/sunrpc/rpcb_clnt.c3
5 files changed, 20 insertions, 15 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 3353ed8421a7..908b23fadd05 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -10,6 +10,7 @@
10#include <linux/utsname.h> 10#include <linux/utsname.h>
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/sunrpc/clnt.h> 12#include <linux/sunrpc/clnt.h>
13#include <linux/sunrpc/xprtsock.h>
13#include <linux/sunrpc/svc.h> 14#include <linux/sunrpc/svc.h>
14#include <linux/lockd/lockd.h> 15#include <linux/lockd/lockd.h>
15#include <linux/lockd/sm_inter.h> 16#include <linux/lockd/sm_inter.h>
@@ -132,7 +133,7 @@ nsm_create(void)
132 .sin_port = 0, 133 .sin_port = 0,
133 }; 134 };
134 struct rpc_create_args args = { 135 struct rpc_create_args args = {
135 .protocol = IPPROTO_UDP, 136 .protocol = XPRT_TRANSPORT_UDP,
136 .address = (struct sockaddr *)&sin, 137 .address = (struct sockaddr *)&sin,
137 .addrsize = sizeof(sin), 138 .addrsize = sizeof(sin),
138 .servername = "localhost", 139 .servername = "localhost",
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;
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index 3490322d1145..e87b44ee9ac9 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -76,6 +76,7 @@
76#include <linux/fs.h> 76#include <linux/fs.h>
77#include <linux/init.h> 77#include <linux/init.h>
78#include <linux/sunrpc/clnt.h> 78#include <linux/sunrpc/clnt.h>
79#include <linux/sunrpc/xprtsock.h>
79#include <linux/nfs.h> 80#include <linux/nfs.h>
80#include <linux/nfs_fs.h> 81#include <linux/nfs_fs.h>
81#include <linux/nfs_mount.h> 82#include <linux/nfs_mount.h>
@@ -491,7 +492,7 @@ static int __init root_nfs_get_handle(void)
491 struct sockaddr_in sin; 492 struct sockaddr_in sin;
492 int status; 493 int status;
493 int protocol = (nfs_data.flags & NFS_MOUNT_TCP) ? 494 int protocol = (nfs_data.flags & NFS_MOUNT_TCP) ?
494 IPPROTO_TCP : IPPROTO_UDP; 495 XPRT_TRANSPORT_TCP : XPRT_TRANSPORT_UDP;
495 int version = (nfs_data.flags & NFS_MOUNT_VER3) ? 496 int version = (nfs_data.flags & NFS_MOUNT_VER3) ?
496 NFS_MNT3_VERSION : NFS_MNT_VERSION; 497 NFS_MNT3_VERSION : NFS_MNT_VERSION;
497 498
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 3804aadc18c4..b47e87e6c406 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -33,6 +33,7 @@
33#include <linux/sunrpc/clnt.h> 33#include <linux/sunrpc/clnt.h>
34#include <linux/sunrpc/stats.h> 34#include <linux/sunrpc/stats.h>
35#include <linux/sunrpc/metrics.h> 35#include <linux/sunrpc/metrics.h>
36#include <linux/sunrpc/xprtsock.h>
36#include <linux/nfs_fs.h> 37#include <linux/nfs_fs.h>
37#include <linux/nfs_mount.h> 38#include <linux/nfs_mount.h>
38#include <linux/nfs4_mount.h> 39#include <linux/nfs4_mount.h>
@@ -669,13 +670,13 @@ static int nfs_parse_mount_options(char *raw,
669 break; 670 break;
670 case Opt_udp: 671 case Opt_udp:
671 mnt->flags &= ~NFS_MOUNT_TCP; 672 mnt->flags &= ~NFS_MOUNT_TCP;
672 mnt->nfs_server.protocol = IPPROTO_UDP; 673 mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
673 mnt->timeo = 7; 674 mnt->timeo = 7;
674 mnt->retrans = 5; 675 mnt->retrans = 5;
675 break; 676 break;
676 case Opt_tcp: 677 case Opt_tcp:
677 mnt->flags |= NFS_MOUNT_TCP; 678 mnt->flags |= NFS_MOUNT_TCP;
678 mnt->nfs_server.protocol = IPPROTO_TCP; 679 mnt->nfs_server.protocol = XPRT_TRANSPORT_TCP;
679 mnt->timeo = 600; 680 mnt->timeo = 600;
680 mnt->retrans = 2; 681 mnt->retrans = 2;
681 break; 682 break;
@@ -884,13 +885,13 @@ static int nfs_parse_mount_options(char *raw,
884 switch (token) { 885 switch (token) {
885 case Opt_xprt_udp: 886 case Opt_xprt_udp:
886 mnt->flags &= ~NFS_MOUNT_TCP; 887 mnt->flags &= ~NFS_MOUNT_TCP;
887 mnt->nfs_server.protocol = IPPROTO_UDP; 888 mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
888 mnt->timeo = 7; 889 mnt->timeo = 7;
889 mnt->retrans = 5; 890 mnt->retrans = 5;
890 break; 891 break;
891 case Opt_xprt_tcp: 892 case Opt_xprt_tcp:
892 mnt->flags |= NFS_MOUNT_TCP; 893 mnt->flags |= NFS_MOUNT_TCP;
893 mnt->nfs_server.protocol = IPPROTO_TCP; 894 mnt->nfs_server.protocol = XPRT_TRANSPORT_TCP;
894 mnt->timeo = 600; 895 mnt->timeo = 600;
895 mnt->retrans = 2; 896 mnt->retrans = 2;
896 break; 897 break;
@@ -908,10 +909,10 @@ static int nfs_parse_mount_options(char *raw,
908 909
909 switch (token) { 910 switch (token) {
910 case Opt_xprt_udp: 911 case Opt_xprt_udp:
911 mnt->mount_server.protocol = IPPROTO_UDP; 912 mnt->mount_server.protocol = XPRT_TRANSPORT_UDP;
912 break; 913 break;
913 case Opt_xprt_tcp: 914 case Opt_xprt_tcp:
914 mnt->mount_server.protocol = IPPROTO_TCP; 915 mnt->mount_server.protocol = XPRT_TRANSPORT_TCP;
915 break; 916 break;
916 default: 917 default:
917 goto out_unrec_xprt; 918 goto out_unrec_xprt;
@@ -1061,9 +1062,9 @@ static int nfs_validate_mount_data(void *options,
1061 args->acregmax = 60; 1062 args->acregmax = 60;
1062 args->acdirmin = 30; 1063 args->acdirmin = 30;
1063 args->acdirmax = 60; 1064 args->acdirmax = 60;
1064 args->mount_server.protocol = IPPROTO_UDP; 1065 args->mount_server.protocol = XPRT_TRANSPORT_UDP;
1065 args->mount_server.program = NFS_MNT_PROGRAM; 1066 args->mount_server.program = NFS_MNT_PROGRAM;
1066 args->nfs_server.protocol = IPPROTO_TCP; 1067 args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
1067 args->nfs_server.program = NFS_PROGRAM; 1068 args->nfs_server.program = NFS_PROGRAM;
1068 1069
1069 switch (data->version) { 1070 switch (data->version) {
@@ -1110,7 +1111,7 @@ static int nfs_validate_mount_data(void *options,
1110 args->acdirmax = data->acdirmax; 1111 args->acdirmax = data->acdirmax;
1111 args->nfs_server.address = data->addr; 1112 args->nfs_server.address = data->addr;
1112 if (!(data->flags & NFS_MOUNT_TCP)) 1113 if (!(data->flags & NFS_MOUNT_TCP))
1113 args->nfs_server.protocol = IPPROTO_UDP; 1114 args->nfs_server.protocol = XPRT_TRANSPORT_UDP;
1114 /* N.B. caller will free nfs_server.hostname in all cases */ 1115 /* N.B. caller will free nfs_server.hostname in all cases */
1115 args->nfs_server.hostname = kstrdup(data->hostname, GFP_KERNEL); 1116 args->nfs_server.hostname = kstrdup(data->hostname, GFP_KERNEL);
1116 args->namlen = data->namlen; 1117 args->namlen = data->namlen;
@@ -1533,7 +1534,7 @@ static int nfs4_validate_mount_data(void *options,
1533 args->acregmax = 60; 1534 args->acregmax = 60;
1534 args->acdirmin = 30; 1535 args->acdirmin = 30;
1535 args->acdirmax = 60; 1536 args->acdirmax = 60;
1536 args->nfs_server.protocol = IPPROTO_TCP; 1537 args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
1537 1538
1538 switch (data->version) { 1539 switch (data->version) {
1539 case 1: 1540 case 1:
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 09a2a8fde093..8db3d70c23e3 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -23,6 +23,7 @@
23 23
24#include <linux/sunrpc/clnt.h> 24#include <linux/sunrpc/clnt.h>
25#include <linux/sunrpc/sched.h> 25#include <linux/sunrpc/sched.h>
26#include <linux/sunrpc/xprtsock.h>
26 27
27#ifdef RPC_DEBUG 28#ifdef RPC_DEBUG
28# define RPCDBG_FACILITY RPCDBG_BIND 29# define RPCDBG_FACILITY RPCDBG_BIND
@@ -229,7 +230,7 @@ int rpcb_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)
229 prog, vers, prot, port); 230 prog, vers, prot, port);
230 231
231 rpcb_clnt = rpcb_create("localhost", (struct sockaddr *) &sin, 232 rpcb_clnt = rpcb_create("localhost", (struct sockaddr *) &sin,
232 IPPROTO_UDP, 2, 1); 233 XPRT_TRANSPORT_UDP, 2, 1);
233 if (IS_ERR(rpcb_clnt)) 234 if (IS_ERR(rpcb_clnt))
234 return PTR_ERR(rpcb_clnt); 235 return PTR_ERR(rpcb_clnt);
235 236
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-26 00:14:10 -0500