All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <4508DFA0.2060806@redhat.com>

diff --git a/a/1.txt b/N1/1.txt
index 5c91379..af43b27 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,12 +23,3 @@ Signed-off-by: Lon Hohberger  <lhh@redhat.com>
  include/linux/sunrpc/svc.h     |    5 +++--
  net/sunrpc/svcsock.c           |    5 +++++
  8 files changed, 39 insertions(+), 12 deletions(-)
-
-
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: gfs_statd.patch
-Type: text/x-patch
-Size: 6714 bytes
-Desc: not available
-URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20060914/282cca28/attachment.bin>
diff --git a/N1/2.hdr b/N1/2.hdr
new file mode 100644
index 0000000..4e7a129
--- /dev/null
+++ b/N1/2.hdr
@@ -0,0 +1,5 @@
+Content-Type: text/x-patch;
+ name="gfs_statd.patch"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline;
+ filename="gfs_statd.patch"
diff --git a/N1/2.txt b/N1/2.txt
new file mode 100644
index 0000000..9ec22dd
--- /dev/null
+++ b/N1/2.txt
@@ -0,0 +1,184 @@
+--- linux-2/include/linux/sunrpc/svc.h	2006-09-11 16:52:34.000000000 -0400
++++ linux-3/include/linux/sunrpc/svc.h	2006-09-13 14:07:32.000000000 -0400
+@@ -102,6 +102,7 @@ static inline void svc_putu32(struct kve
+ 	iov->iov_len += sizeof(u32);
+ }
+ 
++typedef __u32  svc_addr_t;
+ 	
+ /*
+  * The context of a single thread, including the request currently being
+@@ -138,8 +139,8 @@ struct svc_rqst {
+ 	unsigned short
+ 				rq_secure  : 1;	/* secure port */
+ 
+-
+-	__u32			rq_daddr;	/* dest addr of request - reply from here */
++	svc_addr_t		rq_daddr;	/* dest addr of request 
++						   - reply from here */
+ 
+ 	void *			rq_argp;	/* decoded arguments */
+ 	void *			rq_resp;	/* xdr'd results */
+--- linux-2/include/linux/lockd/lockd.h	2006-09-13 22:48:00.000000000 -0400
++++ linux-3/include/linux/lockd/lockd.h	2006-09-13 22:51:41.000000000 -0400
+@@ -39,12 +39,13 @@
+ struct nlm_host {
+ 	struct nlm_host *	h_next;		/* linked list (hash table) */
+ 	struct sockaddr_in	h_addr;		/* peer address */
++	svc_addr_t		h_server;	/* server ip for NLM failover */
+ 	struct rpc_clnt	*	h_rpcclnt;	/* RPC client to talk to peer */
+ 	char			h_name[20];	/* remote hostname */
+ 	u32			h_version;	/* interface version */
+ 	unsigned short		h_proto;	/* transport proto */
+ 	unsigned short		h_reclaiming : 1,
+-				h_server     : 1, /* server side, not client side */
++				h_notused    : 1, 
+ 				h_inuse      : 1,
+ 				h_killed     : 1,
+ 				h_monitored  : 1;
+@@ -175,7 +176,7 @@ int		  nlmclnt_reclaim(struct nlm_host *
+  */
+ struct nlm_host * nlmclnt_lookup_host(struct sockaddr_in *, int, int);
+ struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *);
+-struct nlm_host * nlm_lookup_host(int server, struct sockaddr_in *, int, int);
++struct nlm_host * nlm_lookup_host(svc_addr_t server, struct sockaddr_in *, int, int);
+ struct rpc_clnt * nlm_bind_host(struct nlm_host *);
+ void		  nlm_rebind_host(struct nlm_host *);
+ struct nlm_host * nlm_get_host(struct nlm_host *);
+--- linux-2/include/linux/lockd/sm_inter.h	2006-09-11 16:52:34.000000000 -0400
++++ linux-3/include/linux/lockd/sm_inter.h	2006-09-13 14:07:32.000000000 -0400
+@@ -25,6 +25,7 @@
+  */
+ struct nsm_args {
+ 	u32		addr;		/* remote address */
++	u32		serv;		/* server ip address */
+ 	u32		prog;		/* RPC callback info */
+ 	u32		vers;
+ 	u32		proc;
+--- linux-2/net/sunrpc/svcsock.c	2006-09-11 16:50:47.000000000 -0400
++++ linux-3/net/sunrpc/svcsock.c	2006-09-13 14:05:40.000000000 -0400
+@@ -454,6 +454,7 @@ svc_recvfrom(struct svc_rqst *rqstp, str
+ 	struct msghdr	msg;
+ 	struct socket	*sock;
+ 	int		len, alen;
++	struct sockaddr_in   daddr;
+ 
+ 	rqstp->rq_addrlen = sizeof(rqstp->rq_addr);
+ 	sock = rqstp->rq_sock->sk_sock;
+@@ -474,6 +475,10 @@ svc_recvfrom(struct svc_rqst *rqstp, str
+ 	alen = sizeof(rqstp->rq_addr);
+ 	sock->ops->getname(sock, (struct sockaddr *)&rqstp->rq_addr, &alen, 1);
+ 
++	/* add server ip for nlm lock failover */
++	sock->ops->getname(sock, (struct sockaddr *)&daddr, &alen, 0);
++	rqstp->rq_daddr = daddr.sin_addr.s_addr;
++
+ 	dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n",
+ 		rqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, len);
+ 
+--- linux-2/fs/lockd/svc4proc.c	2006-09-13 14:03:39.000000000 -0400
++++ linux-3/fs/lockd/svc4proc.c	2006-09-13 14:16:54.000000000 -0400
+@@ -138,6 +138,12 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp
+ 		return rpc_success;
+ 	}
+ 
++#if 0
++	if (argp->reclaim) {
++		printk("nlm4svc_proc_lock lock reclaim received\n");
++	}
++#endif
++
+ 	/* Obtain client and file */
+ 	if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))
+ 		return rpc_success;
+@@ -462,7 +468,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst *
+ 	} else {
+ 		/* If we run on an NFS server, delete all locks held by the client */
+ 
+-		if ((host = nlm_lookup_host(1, &saddr, prot, vers)) != NULL) {
++		if ((host = nlm_lookup_host(rqstp->rq_daddr, &saddr, prot, vers)) != NULL) {
+ 			nlmsvc_free_host_resources(host);
+ 			nlm_release_host(host);
+ 		}
+--- linux-2/fs/lockd/svcproc.c	2006-09-13 13:51:59.000000000 -0400
++++ linux-3/fs/lockd/svcproc.c	2006-09-13 14:06:58.000000000 -0400
+@@ -491,7 +491,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *r
+ 		}
+ 	} else {
+ 		/* If we run on an NFS server, delete all locks held by the client */
+-		if ((host = nlm_lookup_host(1, &saddr, prot, vers)) != NULL) {
++		if ((host = nlm_lookup_host(rqstp->rq_daddr, &saddr, prot, vers)) != NULL) {
+ 			nlmsvc_free_host_resources(host);
+ 			nlm_release_host(host);
+ 		}
+--- linux-2/fs/lockd/mon.c	2006-09-11 16:51:58.000000000 -0400
++++ linux-3/fs/lockd/mon.c	2006-09-13 14:06:59.000000000 -0400
+@@ -47,7 +47,8 @@ nsm_mon_unmon(struct nlm_host *host, u32
+ 	}
+ 
+ 	args.addr = host->h_addr.sin_addr.s_addr;
+-	args.proto= (host->h_proto<<1) | host->h_server;
++	args.serv = host->h_server;
++	args.proto= (host->h_proto<<1) | (host->h_server ? 1:0);
+ 	args.prog = NLM_PROGRAM;
+ 	args.vers = host->h_version;
+ 	args.proc = NLMPROC_NSM_NOTIFY;
+@@ -135,6 +136,13 @@ out_err:
+ 	return clnt;
+ }
+ 
++/* We want "buffer" in xdr_encode_common() to hold
++ * either the system_utsname.nodename string (__NEW_UTS_LEN+1)
++ * or IPv4 dot notation (16 bytes+1) for now.
++ */ 
++
++#define	XDR_ENCODE_BUF_LEN __NEW_UTS_LEN+1	
++
+ /*
+  * XDR functions for NSM.
+  */
+@@ -142,7 +150,7 @@ out_err:
+ static u32 *
+ xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
+ {
+-	char	buffer[20];
++	char	buffer[XDR_ENCODE_BUF_LEN];
+ 
+ 	/*
+ 	 * Use the dotted-quad IP address of the remote host as
+@@ -151,8 +159,13 @@ xdr_encode_common(struct rpc_rqst *rqstp
+ 	 * so this works alright.
+ 	 */
+ 	sprintf(buffer, "%u.%u.%u.%u", NIPQUAD(argp->addr));
+-	if (!(p = xdr_encode_string(p, buffer))
+-	 || !(p = xdr_encode_string(p, system_utsname.nodename)))
++	if (!(p = xdr_encode_string(p, buffer)))
++		return ERR_PTR(-EIO);
++	if (argp->serv)
++		sprintf(buffer, "%u.%u.%u.%u", NIPQUAD(argp->serv));
++	else
++		sprintf(buffer, "%s", system_utsname.nodename);
++	if (!(p = xdr_encode_string(p, buffer)))
+ 		return ERR_PTR(-EIO);
+ 	*p++ = htonl(argp->prog);
+ 	*p++ = htonl(argp->vers);
+--- linux-2/fs/lockd/host.c	2006-09-11 16:51:58.000000000 -0400
++++ linux-3/fs/lockd/host.c	2006-09-13 14:06:59.000000000 -0400
+@@ -51,7 +51,7 @@ nlmclnt_lookup_host(struct sockaddr_in *
+ struct nlm_host *
+ nlmsvc_lookup_host(struct svc_rqst *rqstp)
+ {
+-	return nlm_lookup_host(1, &rqstp->rq_addr,
++	return nlm_lookup_host(rqstp->rq_daddr, &rqstp->rq_addr,
+ 			       rqstp->rq_prot, rqstp->rq_vers);
+ }
+ 
+@@ -59,7 +59,7 @@ nlmsvc_lookup_host(struct svc_rqst *rqst
+  * Common host lookup routine for server & client
+  */
+ struct nlm_host *
+-nlm_lookup_host(int server, struct sockaddr_in *sin,
++nlm_lookup_host(svc_addr_t server, struct sockaddr_in *sin,
+ 					int proto, int version)
+ {
+ 	struct nlm_host	*host, **hp;
diff --git a/N1/3.hdr b/N1/3.hdr
new file mode 100644
index 0000000..4b86001
--- /dev/null
+++ b/N1/3.hdr
@@ -0,0 +1,4 @@
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
diff --git a/N1/3.txt b/N1/3.txt
new file mode 100644
index 0000000..b5ca0c1
--- /dev/null
+++ b/N1/3.txt
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------------
+Using Tomcat but need to do more? Need to support web services, security?
+Get stuff done quickly with pre-integrated technology to make your job easier
+Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
+http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
diff --git a/N1/4.hdr b/N1/4.hdr
new file mode 100644
index 0000000..4b86001
--- /dev/null
+++ b/N1/4.hdr
@@ -0,0 +1,4 @@
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
diff --git a/N1/4.txt b/N1/4.txt
new file mode 100644
index 0000000..5264bf8
--- /dev/null
+++ b/N1/4.txt
@@ -0,0 +1,3 @@
+_______________________________________________
+NFS maillist  -  NFS@lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/nfs
diff --git a/a/content_digest b/N1/content_digest
index 12c6d15..952cbae 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,10 @@
  "From\0Wendy Cheng <wcheng@redhat.com>\0"
- "Subject\0[Cluster-devel] [PATCH 3/4 Revised] NLM failover - statd changes\0"
+ "Subject\0[PATCH 3/4 Revised] NLM failover - statd changes\0"
  "Date\0Thu, 14 Sep 2006 00:50:40 -0400\0"
- "To\0cluster-devel.redhat.com\0"
- "\00:1\0"
+ "To\0nfs@lists.sourceforge.net"
+ " cluster-devel@redhat.com\0"
+ "Cc\0lhh@redhat.com\0"
+ "\01:1\0"
  "b\0"
  "This kernel patch should be paired with nfs-utils user mode changes (in \n"
  "patch 4-4 based on nfs-utils-1.0.8-rc4) that is optional. If changes \n"
@@ -28,15 +30,205 @@
  " include/linux/lockd/sm_inter.h |    1 +\n"
  " include/linux/sunrpc/svc.h     |    5 +++--\n"
  " net/sunrpc/svcsock.c           |    5 +++++\n"
- " 8 files changed, 39 insertions(+), 12 deletions(-)\n"
- "\n"
- "\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: gfs_statd.patch\n"
- "Type: text/x-patch\n"
- "Size: 6714 bytes\n"
- "Desc: not available\n"
- URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20060914/282cca28/attachment.bin>
+  8 files changed, 39 insertions(+), 12 deletions(-)
+ "\01:2\0"
+ "fn\0gfs_statd.patch\0"
+ "b\0"
+ "--- linux-2/include/linux/sunrpc/svc.h\t2006-09-11 16:52:34.000000000 -0400\n"
+ "+++ linux-3/include/linux/sunrpc/svc.h\t2006-09-13 14:07:32.000000000 -0400\n"
+ "@@ -102,6 +102,7 @@ static inline void svc_putu32(struct kve\n"
+ " \tiov->iov_len += sizeof(u32);\n"
+ " }\n"
+ " \n"
+ "+typedef __u32  svc_addr_t;\n"
+ " \t\n"
+ " /*\n"
+ "  * The context of a single thread, including the request currently being\n"
+ "@@ -138,8 +139,8 @@ struct svc_rqst {\n"
+ " \tunsigned short\n"
+ " \t\t\t\trq_secure  : 1;\t/* secure port */\n"
+ " \n"
+ "-\n"
+ "-\t__u32\t\t\trq_daddr;\t/* dest addr of request - reply from here */\n"
+ "+\tsvc_addr_t\t\trq_daddr;\t/* dest addr of request \n"
+ "+\t\t\t\t\t\t   - reply from here */\n"
+ " \n"
+ " \tvoid *\t\t\trq_argp;\t/* decoded arguments */\n"
+ " \tvoid *\t\t\trq_resp;\t/* xdr'd results */\n"
+ "--- linux-2/include/linux/lockd/lockd.h\t2006-09-13 22:48:00.000000000 -0400\n"
+ "+++ linux-3/include/linux/lockd/lockd.h\t2006-09-13 22:51:41.000000000 -0400\n"
+ "@@ -39,12 +39,13 @@\n"
+ " struct nlm_host {\n"
+ " \tstruct nlm_host *\th_next;\t\t/* linked list (hash table) */\n"
+ " \tstruct sockaddr_in\th_addr;\t\t/* peer address */\n"
+ "+\tsvc_addr_t\t\th_server;\t/* server ip for NLM failover */\n"
+ " \tstruct rpc_clnt\t*\th_rpcclnt;\t/* RPC client to talk to peer */\n"
+ " \tchar\t\t\th_name[20];\t/* remote hostname */\n"
+ " \tu32\t\t\th_version;\t/* interface version */\n"
+ " \tunsigned short\t\th_proto;\t/* transport proto */\n"
+ " \tunsigned short\t\th_reclaiming : 1,\n"
+ "-\t\t\t\th_server     : 1, /* server side, not client side */\n"
+ "+\t\t\t\th_notused    : 1, \n"
+ " \t\t\t\th_inuse      : 1,\n"
+ " \t\t\t\th_killed     : 1,\n"
+ " \t\t\t\th_monitored  : 1;\n"
+ "@@ -175,7 +176,7 @@ int\t\t  nlmclnt_reclaim(struct nlm_host *\n"
+ "  */\n"
+ " struct nlm_host * nlmclnt_lookup_host(struct sockaddr_in *, int, int);\n"
+ " struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *);\n"
+ "-struct nlm_host * nlm_lookup_host(int server, struct sockaddr_in *, int, int);\n"
+ "+struct nlm_host * nlm_lookup_host(svc_addr_t server, struct sockaddr_in *, int, int);\n"
+ " struct rpc_clnt * nlm_bind_host(struct nlm_host *);\n"
+ " void\t\t  nlm_rebind_host(struct nlm_host *);\n"
+ " struct nlm_host * nlm_get_host(struct nlm_host *);\n"
+ "--- linux-2/include/linux/lockd/sm_inter.h\t2006-09-11 16:52:34.000000000 -0400\n"
+ "+++ linux-3/include/linux/lockd/sm_inter.h\t2006-09-13 14:07:32.000000000 -0400\n"
+ "@@ -25,6 +25,7 @@\n"
+ "  */\n"
+ " struct nsm_args {\n"
+ " \tu32\t\taddr;\t\t/* remote address */\n"
+ "+\tu32\t\tserv;\t\t/* server ip address */\n"
+ " \tu32\t\tprog;\t\t/* RPC callback info */\n"
+ " \tu32\t\tvers;\n"
+ " \tu32\t\tproc;\n"
+ "--- linux-2/net/sunrpc/svcsock.c\t2006-09-11 16:50:47.000000000 -0400\n"
+ "+++ linux-3/net/sunrpc/svcsock.c\t2006-09-13 14:05:40.000000000 -0400\n"
+ "@@ -454,6 +454,7 @@ svc_recvfrom(struct svc_rqst *rqstp, str\n"
+ " \tstruct msghdr\tmsg;\n"
+ " \tstruct socket\t*sock;\n"
+ " \tint\t\tlen, alen;\n"
+ "+\tstruct sockaddr_in   daddr;\n"
+ " \n"
+ " \trqstp->rq_addrlen = sizeof(rqstp->rq_addr);\n"
+ " \tsock = rqstp->rq_sock->sk_sock;\n"
+ "@@ -474,6 +475,10 @@ svc_recvfrom(struct svc_rqst *rqstp, str\n"
+ " \talen = sizeof(rqstp->rq_addr);\n"
+ " \tsock->ops->getname(sock, (struct sockaddr *)&rqstp->rq_addr, &alen, 1);\n"
+ " \n"
+ "+\t/* add server ip for nlm lock failover */\n"
+ "+\tsock->ops->getname(sock, (struct sockaddr *)&daddr, &alen, 0);\n"
+ "+\trqstp->rq_daddr = daddr.sin_addr.s_addr;\n"
+ "+\n"
+ " \tdprintk(\"svc: socket %p recvfrom(%p, %Zu) = %d\\n\",\n"
+ " \t\trqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, len);\n"
+ " \n"
+ "--- linux-2/fs/lockd/svc4proc.c\t2006-09-13 14:03:39.000000000 -0400\n"
+ "+++ linux-3/fs/lockd/svc4proc.c\t2006-09-13 14:16:54.000000000 -0400\n"
+ "@@ -138,6 +138,12 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp\n"
+ " \t\treturn rpc_success;\n"
+ " \t}\n"
+ " \n"
+ "+#if 0\n"
+ "+\tif (argp->reclaim) {\n"
+ "+\t\tprintk(\"nlm4svc_proc_lock lock reclaim received\\n\");\n"
+ "+\t}\n"
+ "+#endif\n"
+ "+\n"
+ " \t/* Obtain client and file */\n"
+ " \tif ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))\n"
+ " \t\treturn rpc_success;\n"
+ "@@ -462,7 +468,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst *\n"
+ " \t} else {\n"
+ " \t\t/* If we run on an NFS server, delete all locks held by the client */\n"
+ " \n"
+ "-\t\tif ((host = nlm_lookup_host(1, &saddr, prot, vers)) != NULL) {\n"
+ "+\t\tif ((host = nlm_lookup_host(rqstp->rq_daddr, &saddr, prot, vers)) != NULL) {\n"
+ " \t\t\tnlmsvc_free_host_resources(host);\n"
+ " \t\t\tnlm_release_host(host);\n"
+ " \t\t}\n"
+ "--- linux-2/fs/lockd/svcproc.c\t2006-09-13 13:51:59.000000000 -0400\n"
+ "+++ linux-3/fs/lockd/svcproc.c\t2006-09-13 14:06:58.000000000 -0400\n"
+ "@@ -491,7 +491,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *r\n"
+ " \t\t}\n"
+ " \t} else {\n"
+ " \t\t/* If we run on an NFS server, delete all locks held by the client */\n"
+ "-\t\tif ((host = nlm_lookup_host(1, &saddr, prot, vers)) != NULL) {\n"
+ "+\t\tif ((host = nlm_lookup_host(rqstp->rq_daddr, &saddr, prot, vers)) != NULL) {\n"
+ " \t\t\tnlmsvc_free_host_resources(host);\n"
+ " \t\t\tnlm_release_host(host);\n"
+ " \t\t}\n"
+ "--- linux-2/fs/lockd/mon.c\t2006-09-11 16:51:58.000000000 -0400\n"
+ "+++ linux-3/fs/lockd/mon.c\t2006-09-13 14:06:59.000000000 -0400\n"
+ "@@ -47,7 +47,8 @@ nsm_mon_unmon(struct nlm_host *host, u32\n"
+ " \t}\n"
+ " \n"
+ " \targs.addr = host->h_addr.sin_addr.s_addr;\n"
+ "-\targs.proto= (host->h_proto<<1) | host->h_server;\n"
+ "+\targs.serv = host->h_server;\n"
+ "+\targs.proto= (host->h_proto<<1) | (host->h_server ? 1:0);\n"
+ " \targs.prog = NLM_PROGRAM;\n"
+ " \targs.vers = host->h_version;\n"
+ " \targs.proc = NLMPROC_NSM_NOTIFY;\n"
+ "@@ -135,6 +136,13 @@ out_err:\n"
+ " \treturn clnt;\n"
+ " }\n"
+ " \n"
+ "+/* We want \"buffer\" in xdr_encode_common() to hold\n"
+ "+ * either the system_utsname.nodename string (__NEW_UTS_LEN+1)\n"
+ "+ * or IPv4 dot notation (16 bytes+1) for now.\n"
+ "+ */ \n"
+ "+\n"
+ "+#define\tXDR_ENCODE_BUF_LEN __NEW_UTS_LEN+1\t\n"
+ "+\n"
+ " /*\n"
+ "  * XDR functions for NSM.\n"
+ "  */\n"
+ "@@ -142,7 +150,7 @@ out_err:\n"
+ " static u32 *\n"
+ " xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)\n"
+ " {\n"
+ "-\tchar\tbuffer[20];\n"
+ "+\tchar\tbuffer[XDR_ENCODE_BUF_LEN];\n"
+ " \n"
+ " \t/*\n"
+ " \t * Use the dotted-quad IP address of the remote host as\n"
+ "@@ -151,8 +159,13 @@ xdr_encode_common(struct rpc_rqst *rqstp\n"
+ " \t * so this works alright.\n"
+ " \t */\n"
+ " \tsprintf(buffer, \"%u.%u.%u.%u\", NIPQUAD(argp->addr));\n"
+ "-\tif (!(p = xdr_encode_string(p, buffer))\n"
+ "-\t || !(p = xdr_encode_string(p, system_utsname.nodename)))\n"
+ "+\tif (!(p = xdr_encode_string(p, buffer)))\n"
+ "+\t\treturn ERR_PTR(-EIO);\n"
+ "+\tif (argp->serv)\n"
+ "+\t\tsprintf(buffer, \"%u.%u.%u.%u\", NIPQUAD(argp->serv));\n"
+ "+\telse\n"
+ "+\t\tsprintf(buffer, \"%s\", system_utsname.nodename);\n"
+ "+\tif (!(p = xdr_encode_string(p, buffer)))\n"
+ " \t\treturn ERR_PTR(-EIO);\n"
+ " \t*p++ = htonl(argp->prog);\n"
+ " \t*p++ = htonl(argp->vers);\n"
+ "--- linux-2/fs/lockd/host.c\t2006-09-11 16:51:58.000000000 -0400\n"
+ "+++ linux-3/fs/lockd/host.c\t2006-09-13 14:06:59.000000000 -0400\n"
+ "@@ -51,7 +51,7 @@ nlmclnt_lookup_host(struct sockaddr_in *\n"
+ " struct nlm_host *\n"
+ " nlmsvc_lookup_host(struct svc_rqst *rqstp)\n"
+ " {\n"
+ "-\treturn nlm_lookup_host(1, &rqstp->rq_addr,\n"
+ "+\treturn nlm_lookup_host(rqstp->rq_daddr, &rqstp->rq_addr,\n"
+ " \t\t\t       rqstp->rq_prot, rqstp->rq_vers);\n"
+ " }\n"
+ " \n"
+ "@@ -59,7 +59,7 @@ nlmsvc_lookup_host(struct svc_rqst *rqst\n"
+ "  * Common host lookup routine for server & client\n"
+ "  */\n"
+ " struct nlm_host *\n"
+ "-nlm_lookup_host(int server, struct sockaddr_in *sin,\n"
+ "+nlm_lookup_host(svc_addr_t server, struct sockaddr_in *sin,\n"
+ " \t\t\t\t\tint proto, int version)\n"
+ " {\n"
+ " \tstruct nlm_host\t*host, **hp;"
+ "\01:3\0"
+ "b\0"
+ "-------------------------------------------------------------------------\n"
+ "Using Tomcat but need to do more? Need to support web services, security?\n"
+ "Get stuff done quickly with pre-integrated technology to make your job easier\n"
+ "Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo\n"
+ http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
+ "\01:4\0"
+ "b\0"
+ "_______________________________________________\n"
+ "NFS maillist  -  NFS@lists.sourceforge.net\n"
+ https://lists.sourceforge.net/lists/listinfo/nfs
 
-f5b93b259e58deab984ab09d40dc07ec631445983d3e27b07404427de3857440
+5705c558478761569c6c6555246a0dba462063493611376412a39faeba3ead04

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.