diff for duplicates of <44A41D78.5000201@redhat.com> diff --git a/a/1.txt b/N1/1.txt index b886394..c2c174d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,3 @@ the correct taken-over IPv4 address in standard dot notation into the "add-client" event. Upon "del-client" event, we would assume the monitored host should be removed from server-wide lists, regardless individual server's interface. --------------- next part -------------- -An embedded and charset-unspecified text was scrubbed... -Name: gfs_statd.patch -URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20060629/eaba1979/attachment.ksh> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..8d545d0 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/plain; + 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..221d124 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,150 @@ + fs/lockd/clntproc.c | 2 +- + fs/lockd/host.c | 2 +- + fs/lockd/mon.c | 21 +++++++++++++-------- + fs/lockd/svc4proc.c | 2 +- + fs/lockd/svcproc.c | 2 +- + include/linux/lockd/sm_inter.h | 5 +++-- + 6 files changed, 20 insertions(+), 14 deletions(-) + +--- linux-2.6.17-2/include/linux/lockd/sm_inter.h 2006-06-27 22:52:32.000000000 -0400 ++++ linux-2.6.17-3/include/linux/lockd/sm_inter.h 2006-06-28 23:20:02.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; +@@ -39,8 +40,8 @@ struct nsm_res { + u32 state; + }; + +-int nsm_monitor(struct nlm_host *); +-int nsm_unmonitor(struct nlm_host *); ++int nsm_monitor(struct nlm_host *, __u32 *serv_ip); ++int nsm_unmonitor(struct nlm_host *, __u32 *serv_ip); + extern u32 nsm_local_state; + + #endif /* LINUX_LOCKD_SM_INTER_H */ +--- linux-2.6.17-2/fs/lockd/svc4proc.c 2006-06-28 14:19:24.000000000 -0400 ++++ linux-2.6.17-3/fs/lockd/svc4proc.c 2006-06-29 09:10:02.000000000 -0400 +@@ -58,7 +58,7 @@ nlm4svc_retrieve_args(struct svc_rqst *r + + /* Obtain host handle */ + if (!(host = nlmsvc_lookup_host(rqstp)) +- || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0)) ++ || (argp->monitor && !host->h_monitored && nsm_monitor(host, &rqstp->rq_daddr) < 0)) + goto no_locks; + *hostp = host; + +--- linux-2.6.17-2/fs/lockd/svcproc.c 2006-06-28 14:19:50.000000000 -0400 ++++ linux-2.6.17-3/fs/lockd/svcproc.c 2006-06-29 09:10:02.000000000 -0400 +@@ -89,7 +89,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rq + + /* Obtain host handle */ + if (!(host = nlmsvc_lookup_host(rqstp)) +- || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0)) ++ || (argp->monitor && !host->h_monitored && nsm_monitor(host, &rqstp->rq_daddr) < 0)) + goto no_locks; + *hostp = host; + +--- linux-2.6.17-2/fs/lockd/clntproc.c 2006-06-27 22:49:16.000000000 -0400 ++++ linux-2.6.17-3/fs/lockd/clntproc.c 2006-06-29 09:10:02.000000000 -0400 +@@ -501,7 +501,7 @@ nlmclnt_lock(struct nlm_rqst *req, struc + struct nlm_wait *block = NULL; + int status = -ENOLCK; + +- if (!host->h_monitored && nsm_monitor(host) < 0) { ++ if (!host->h_monitored && nsm_monitor(host,NULL) < 0) { + printk(KERN_NOTICE "lockd: failed to monitor %s\n", + host->h_name); + goto out; +--- linux-2.6.17-2/fs/lockd/mon.c 2006-06-27 22:49:16.000000000 -0400 ++++ linux-2.6.17-3/fs/lockd/mon.c 2006-06-29 09:21:03.000000000 -0400 +@@ -14,7 +14,6 @@ + #include <linux/lockd/lockd.h> + #include <linux/lockd/sm_inter.h> + +- + #define NLMDBG_FACILITY NLMDBG_MONITOR + + static struct rpc_clnt * nsm_create(void); +@@ -30,7 +29,7 @@ u32 nsm_local_state; + * Common procedure for SM_MON/SM_UNMON calls + */ + static int +-nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res) ++nsm_mon_unmon(struct nlm_host *host, __u32 *serv_ip, u32 proc, struct nsm_res *res) + { + struct rpc_clnt *clnt; + int status; +@@ -47,6 +46,7 @@ nsm_mon_unmon(struct nlm_host *host, u32 + } + + args.addr = host->h_addr.sin_addr.s_addr; ++ args.serv = *serv_ip; + args.proto= (host->h_proto<<1) | host->h_server; + args.prog = NLM_PROGRAM; + args.vers = host->h_version; +@@ -68,14 +68,14 @@ nsm_mon_unmon(struct nlm_host *host, u32 + * Set up monitoring of a remote host + */ + int +-nsm_monitor(struct nlm_host *host) ++nsm_monitor(struct nlm_host *host, __u32 *serv_ip) + { + struct nsm_res res; + int status; + + dprintk("lockd: nsm_monitor(%s)\n", host->h_name); + +- status = nsm_mon_unmon(host, SM_MON, &res); ++ status = nsm_mon_unmon(host, serv_ip, SM_MON, &res); + + if (status < 0 || res.status != 0) + printk(KERN_NOTICE "lockd: cannot monitor %s\n", host->h_name); +@@ -88,14 +88,14 @@ nsm_monitor(struct nlm_host *host) + * Cease to monitor remote host + */ + int +-nsm_unmonitor(struct nlm_host *host) ++nsm_unmonitor(struct nlm_host *host, __u32 *serv_ip) + { + struct nsm_res res; + int status; + + dprintk("lockd: nsm_unmonitor(%s)\n", host->h_name); + +- status = nsm_mon_unmon(host, SM_UNMON, &res); ++ status = nsm_mon_unmon(host, serv_ip, SM_UNMON, &res); + if (status < 0) + printk(KERN_NOTICE "lockd: cannot unmonitor %s\n", host->h_name); + else +@@ -151,8 +151,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.6.17-2/fs/lockd/host.c 2006-06-27 22:49:14.000000000 -0400 ++++ linux-2.6.17-3/fs/lockd/host.c 2006-06-29 09:10:02.000000000 -0400 +@@ -329,7 +329,7 @@ nlm_gc_hosts(void) + *q = host->h_next; + /* Don't unmonitor hosts that have been invalidated */ + if (host->h_monitored && !host->h_killed) +- nsm_unmonitor(host); ++ nsm_unmonitor(host, NULL); + if ((clnt = host->h_rpcclnt) != NULL) { + if (atomic_read(&clnt->cl_users)) { + printk(KERN_WARNING 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..2784664 --- /dev/null +++ b/N1/3.txt @@ -0,0 +1,4 @@ +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 a7676e4..5c7de84 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,10 @@ "From\0Wendy Cheng <wcheng@redhat.com>\0" - "Subject\0[Cluster-devel] [RFC PATCH 3/3] NLM lock failover = statd enablement\0" + "Subject\0[RFC PATCH 3/3] NLM lock failover = statd enablement\0" "Date\0Thu, 29 Jun 2006 14:35:36 -0400\0" - "To\0cluster-devel.redhat.com\0" - "\00:1\0" + "To\0nfs@lists.sourceforge.net" + " cluster-devel@redhat.com\0" + "Cc\0Lon Hohberger <lhh@redhat.com>\0" + "\01:1\0" "b\0" "This kernel patch has *not* been tested out yet and it needs to be \n" "paired with user mode nfs-utils changes (not ready in time for this \n" @@ -12,10 +14,170 @@ "3rd parameter of ha_callout program (see man rpc.statd for details) for \n" "\"add-client\" event. Upon \"del-client\" event, we would assume the \n" "monitored host should be removed from server-wide lists, regardless \n" - "individual server's interface.\n" - "-------------- next part --------------\n" - "An embedded and charset-unspecified text was scrubbed...\n" - "Name: gfs_statd.patch\n" - URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20060629/eaba1979/attachment.ksh> + individual server's interface. + "\01:2\0" + "fn\0gfs_statd.patch\0" + "b\0" + " fs/lockd/clntproc.c | 2 +-\n" + " fs/lockd/host.c | 2 +-\n" + " fs/lockd/mon.c | 21 +++++++++++++--------\n" + " fs/lockd/svc4proc.c | 2 +-\n" + " fs/lockd/svcproc.c | 2 +-\n" + " include/linux/lockd/sm_inter.h | 5 +++--\n" + " 6 files changed, 20 insertions(+), 14 deletions(-)\n" + "\n" + "--- linux-2.6.17-2/include/linux/lockd/sm_inter.h\t2006-06-27 22:52:32.000000000 -0400\n" + "+++ linux-2.6.17-3/include/linux/lockd/sm_inter.h\t2006-06-28 23:20:02.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" + "@@ -39,8 +40,8 @@ struct nsm_res {\n" + " \tu32\t\tstate;\n" + " };\n" + " \n" + "-int\t\tnsm_monitor(struct nlm_host *);\n" + "-int\t\tnsm_unmonitor(struct nlm_host *);\n" + "+int\t\tnsm_monitor(struct nlm_host *, __u32 *serv_ip);\n" + "+int\t\tnsm_unmonitor(struct nlm_host *, __u32 *serv_ip);\n" + " extern u32\tnsm_local_state;\n" + " \n" + " #endif /* LINUX_LOCKD_SM_INTER_H */\n" + "--- linux-2.6.17-2/fs/lockd/svc4proc.c\t2006-06-28 14:19:24.000000000 -0400\n" + "+++ linux-2.6.17-3/fs/lockd/svc4proc.c\t2006-06-29 09:10:02.000000000 -0400\n" + "@@ -58,7 +58,7 @@ nlm4svc_retrieve_args(struct svc_rqst *r\n" + " \n" + " \t/* Obtain host handle */\n" + " \tif (!(host = nlmsvc_lookup_host(rqstp))\n" + "-\t || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0))\n" + "+\t || (argp->monitor && !host->h_monitored && nsm_monitor(host, &rqstp->rq_daddr) < 0))\n" + " \t\tgoto no_locks;\n" + " \t*hostp = host;\n" + " \n" + "--- linux-2.6.17-2/fs/lockd/svcproc.c\t2006-06-28 14:19:50.000000000 -0400\n" + "+++ linux-2.6.17-3/fs/lockd/svcproc.c\t2006-06-29 09:10:02.000000000 -0400\n" + "@@ -89,7 +89,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rq\n" + " \n" + " \t/* Obtain host handle */\n" + " \tif (!(host = nlmsvc_lookup_host(rqstp))\n" + "-\t || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0))\n" + "+\t || (argp->monitor && !host->h_monitored && nsm_monitor(host, &rqstp->rq_daddr) < 0))\n" + " \t\tgoto no_locks;\n" + " \t*hostp = host;\n" + " \n" + "--- linux-2.6.17-2/fs/lockd/clntproc.c\t2006-06-27 22:49:16.000000000 -0400\n" + "+++ linux-2.6.17-3/fs/lockd/clntproc.c\t2006-06-29 09:10:02.000000000 -0400\n" + "@@ -501,7 +501,7 @@ nlmclnt_lock(struct nlm_rqst *req, struc\n" + " \tstruct nlm_wait *block = NULL;\n" + " \tint status = -ENOLCK;\n" + " \n" + "-\tif (!host->h_monitored && nsm_monitor(host) < 0) {\n" + "+\tif (!host->h_monitored && nsm_monitor(host,NULL) < 0) {\n" + " \t\tprintk(KERN_NOTICE \"lockd: failed to monitor %s\\n\",\n" + " \t\t\t\t\thost->h_name);\n" + " \t\tgoto out;\n" + "--- linux-2.6.17-2/fs/lockd/mon.c\t2006-06-27 22:49:16.000000000 -0400\n" + "+++ linux-2.6.17-3/fs/lockd/mon.c\t2006-06-29 09:21:03.000000000 -0400\n" + "@@ -14,7 +14,6 @@\n" + " #include <linux/lockd/lockd.h>\n" + " #include <linux/lockd/sm_inter.h>\n" + " \n" + "-\n" + " #define NLMDBG_FACILITY\t\tNLMDBG_MONITOR\n" + " \n" + " static struct rpc_clnt *\tnsm_create(void);\n" + "@@ -30,7 +29,7 @@ u32\t\t\t\tnsm_local_state;\n" + " * Common procedure for SM_MON/SM_UNMON calls\n" + " */\n" + " static int\n" + "-nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res)\n" + "+nsm_mon_unmon(struct nlm_host *host, __u32 *serv_ip, u32 proc, struct nsm_res *res)\n" + " {\n" + " \tstruct rpc_clnt\t*clnt;\n" + " \tint\t\tstatus;\n" + "@@ -47,6 +46,7 @@ nsm_mon_unmon(struct nlm_host *host, u32\n" + " \t}\n" + " \n" + " \targs.addr = host->h_addr.sin_addr.s_addr;\n" + "+\targs.serv = *serv_ip;\n" + " \targs.proto= (host->h_proto<<1) | host->h_server;\n" + " \targs.prog = NLM_PROGRAM;\n" + " \targs.vers = host->h_version;\n" + "@@ -68,14 +68,14 @@ nsm_mon_unmon(struct nlm_host *host, u32\n" + " * Set up monitoring of a remote host\n" + " */\n" + " int\n" + "-nsm_monitor(struct nlm_host *host)\n" + "+nsm_monitor(struct nlm_host *host, __u32 *serv_ip)\n" + " {\n" + " \tstruct nsm_res\tres;\n" + " \tint\t\tstatus;\n" + " \n" + " \tdprintk(\"lockd: nsm_monitor(%s)\\n\", host->h_name);\n" + " \n" + "-\tstatus = nsm_mon_unmon(host, SM_MON, &res);\n" + "+\tstatus = nsm_mon_unmon(host, serv_ip, SM_MON, &res);\n" + " \n" + " \tif (status < 0 || res.status != 0)\n" + " \t\tprintk(KERN_NOTICE \"lockd: cannot monitor %s\\n\", host->h_name);\n" + "@@ -88,14 +88,14 @@ nsm_monitor(struct nlm_host *host)\n" + " * Cease to monitor remote host\n" + " */\n" + " int\n" + "-nsm_unmonitor(struct nlm_host *host)\n" + "+nsm_unmonitor(struct nlm_host *host, __u32 *serv_ip)\n" + " {\n" + " \tstruct nsm_res\tres;\n" + " \tint\t\tstatus;\n" + " \n" + " \tdprintk(\"lockd: nsm_unmonitor(%s)\\n\", host->h_name);\n" + " \n" + "-\tstatus = nsm_mon_unmon(host, SM_UNMON, &res);\n" + "+\tstatus = nsm_mon_unmon(host, serv_ip, SM_UNMON, &res);\n" + " \tif (status < 0)\n" + " \t\tprintk(KERN_NOTICE \"lockd: cannot unmonitor %s\\n\", host->h_name);\n" + " \telse\n" + "@@ -151,8 +151,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.6.17-2/fs/lockd/host.c\t2006-06-27 22:49:14.000000000 -0400\n" + "+++ linux-2.6.17-3/fs/lockd/host.c\t2006-06-29 09:10:02.000000000 -0400\n" + "@@ -329,7 +329,7 @@ nlm_gc_hosts(void)\n" + " \t\t\t*q = host->h_next;\n" + " \t\t\t/* Don't unmonitor hosts that have been invalidated */\n" + " \t\t\tif (host->h_monitored && !host->h_killed)\n" + "-\t\t\t\tnsm_unmonitor(host);\n" + "+\t\t\t\tnsm_unmonitor(host, NULL);\n" + " \t\t\tif ((clnt = host->h_rpcclnt) != NULL) {\n" + " \t\t\t\tif (atomic_read(&clnt->cl_users)) {\n" + " \t\t\t\t\tprintk(KERN_WARNING" + "\01:3\0" + "b\0" + "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 -007478c975edb7030ecd289b2ee1228475150f3d83175feb099480144a7ffac7 +737f7bed8478484056d1612b51af189200861b5fe17d4ff6b9d781a35c1b9ce2
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.