Skip to contentSkip to conversation

NFSV4 Ipv6 server support

PATCH In review Le Rouzic 1 participant 1 message Sep 16, 2008

Subsystems (3)
lore
Share & tools
lore

Le Rouzic

author
#0 lore raw

PATCH 2/2 NFSV4 Ipv6 server support

NFSV4 IPV6: Enable daemons server to listen on AF_INET6 sockets when IPv6 support available NFSV4 IPV6: Adds AF_INET6 domain processing when AF_INET processing only available

---

 fs/lockd/svc.c       |   10 ++++++++++
 fs/nfs/callback.c    |   12 ++++++++++++
 fs/nfsd/nfsctl.c     |   41 +++++++++++++++++++++++++++++++----------
 fs/nfsd/nfssvc.c     |   11 +++++++++++
 net/sunrpc/svcsock.c |    3 ++-
 5 files changed, 66 insertions(+), 11 deletions(-)

---

fs/lockd/svc.c +10 -0
diff -Nru rpcbindv4/fs/lockd/svc.c ipv6overrpcbindv4/fs/lockd/svc.c
@@ -266,7 +266,17 @@
 			"lockd_up: no pid, %d users??\n", nlmsvc_users);
 
 	error = -ENOMEM;
+
+	/*
+	 * If the kernel has IPv6 support available, always listen for
+	 * both AF_INET and AF_INET6 requests.
+	 */
+	#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+	serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, AF_INET6, NULL);
+	#else
 	serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, AF_INET, NULL);
+	#endif
+
 	if (!serv) {
 		printk(KERN_WARNING "lockd_up: create service failed\n");
 		goto out;
fs/nfs/callback.c +12 -0
diff -Nru rpcbindv4/fs/nfs/callback.c ipv6overrpcbindv4/fs/nfs/callback.c
@@ -105,8 +105,20 @@
 	mutex_lock(&nfs_callback_mutex);
 	if (nfs_callback_info.users++ || nfs_callback_info.task != NULL)
 		goto out;
+
+	/*
+	 * If the kernel has IPv6 support available, always listen for
+	 * both AF_INET and AF_INET6 requests.
+	 */
+	#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE,
+				AF_INET6, NULL);
+	#else
 	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE,
 				AF_INET, NULL);
+	#endif
+
+
 	ret = -ENOMEM;
 	if (!serv)
 		goto out_err;
fs/nfsd/nfsctl.c +31 -10

87 lines not on this page · raw message

fs/nfsd/nfssvc.c +11 -0
diff -Nru rpcbindv4/fs/nfsd/nfssvc.c ipv6overrpcbindv4/fs/nfsd/nfssvc.c
@@ -228,9 +228,20 @@
 	}
 
 	atomic_set(&nfsd_busy, 0);
+	/*
+	 * If the kernel has IPv6 support available, always listen for
+	 * both AF_INET and AF_INET6 requests.
+	 */
+	#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+	nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,
+                                      AF_INET6, nfsd_last_thread,
+                                      nfsd, THIS_MODULE);
+
+	#else
 	nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,
 				      AF_INET, nfsd_last_thread,
 				      nfsd, THIS_MODULE);
+	#endif
 	if (nfsd_serv == NULL)
 		err = -ENOMEM;
 
net/sunrpc/svcsock.c +2 -1
diff -Nru rpcbindv4/net/sunrpc/svcsock.c ipv6overrpcbindv4/net/sunrpc/svcsock.c
@@ -1176,8 +1176,9 @@
 
 	if (!so)
 		return err;
-	if (so->sk->sk_family != AF_INET)
+	if ((so->sk->sk_family != AF_INET) && (so->sk->sk_family != AF_INET6)) {
 		err =  -EAFNOSUPPORT;
+	}
 	else if (so->sk->sk_protocol != IPPROTO_TCP &&
 	    so->sk->sk_protocol != IPPROTO_UDP)
 		err =  -EPROTONOSUPPORT;
Signature · 8 lines
-----------------------------------------------------------------
Company : Bull, Architect of an Open World TM (www.bull.com)
Name    : Aime Le Rouzic 
Mail    : Bull - BP 208 - 38432 Echirolles Cedex - France
E-Mail  : [email protected]
Phone   : 33 (4) 76.29.75.51
Fax     : 33 (4) 76.29.75.18
----------------------------------------------------------------- 

_______________________________________________
NFSv4 mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/nfsv4