patch-2.2.18 linux/net/sunrpc/svc.c

• Lines: 21
• Date: Sun Oct 15 21:15:18 2000
• Orig file: v2.2.17/net/sunrpc/svc.c
• Orig date: Fri Apr 21 12:47:17 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/net/sunrpc/svc.c linux/net/sunrpc/svc.c
@@ -32,6 +32,9 @@
 	struct svc_serv	*serv;
 
 	xdr_init();
+#ifdef RPC_DEBUG
+	rpc_register_sysctl();
+#endif
 
 	if (!(serv = (struct svc_serv *) kmalloc(sizeof(*serv), GFP_KERNEL)))
 		return NULL;
@@ -267,8 +270,8 @@
 	if (prog != progp->pg_prog)
 		goto err_bad_prog;
 
-	versp = progp->pg_vers[vers];
-	if (!versp || vers >= progp->pg_nvers)
+	if (vers >= progp->pg_nvers ||
+	  !(versp = progp->pg_vers[vers]))
 		goto err_bad_vers;
 
 	procp = versp->vs_proc + proc;