* [PATCH] (1/6) ipvs -- get rid of SEQ_START_TOKEN define
@ 2003-09-16 21:17 Stephen Hemminger
2003-09-17 15:59 ` Wensong Zhang
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Hemminger @ 2003-09-16 21:17 UTC (permalink / raw)
To: Wensong Zhang; +Cc: lvs-users, netdev
Applies to 2.6.0-test5 with my seq_file patches from yesterday.
Get rid of SEQ_START_TOKEN -- already defined in proc_fs.hdiff -Nru a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
--- a/net/ipv4/ipvs/ip_vs_app.c Tue Sep 16 14:08:11 2003
+++ b/net/ipv4/ipvs/ip_vs_app.c Tue Sep 16 14:08:11 2003
@@ -485,8 +485,6 @@
/*
* /proc/net/ip_vs_app entry function
*/
-#define SEQ_START_TOKEN ((void *)1)
-
static struct ip_vs_app *ip_vs_app_idx(loff_t pos)
{
loff_t off = 0;
diff -Nru a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
--- a/net/ipv4/ipvs/ip_vs_conn.c Tue Sep 16 14:08:11 2003
+++ b/net/ipv4/ipvs/ip_vs_conn.c Tue Sep 16 14:08:11 2003
@@ -616,8 +616,6 @@
*/
#ifdef CONFIG_PROC_FS
-#define SEQ_START_TOKEN ((void *)1)
-
static void *ip_vs_conn_array(struct seq_file *seq, loff_t pos)
{
struct list_head *e;
diff -Nru a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
--- a/net/ipv4/ipvs/ip_vs_ctl.c Tue Sep 16 14:08:11 2003
+++ b/net/ipv4/ipvs/ip_vs_ctl.c Tue Sep 16 14:08:11 2003
@@ -1516,8 +1516,6 @@
int bucket;
};
-
-#define SEQ_START_TOKEN ((void *)1)
/*
* Write the contents of the VS rule table to a PROCfs file.
* (It is kept just for backward compatibility)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] (1/6) ipvs -- get rid of SEQ_START_TOKEN define
2003-09-16 21:17 [PATCH] (1/6) ipvs -- get rid of SEQ_START_TOKEN define Stephen Hemminger
@ 2003-09-17 15:59 ` Wensong Zhang
2003-09-20 8:04 ` David S. Miller
0 siblings, 1 reply; 3+ messages in thread
From: Wensong Zhang @ 2003-09-17 15:59 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: lvs-users, netdev
On Tue, 16 Sep 2003, Stephen Hemminger wrote:
> Applies to 2.6.0-test5 with my seq_file patches from yesterday.
>
OK, thanks!
Dave, please apply this patch.
Regards,
Wensong
> Get rid of SEQ_START_TOKEN -- already defined in proc_fs.hdiff -Nru a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
> --- a/net/ipv4/ipvs/ip_vs_app.c Tue Sep 16 14:08:11 2003
> +++ b/net/ipv4/ipvs/ip_vs_app.c Tue Sep 16 14:08:11 2003
> @@ -485,8 +485,6 @@
> /*
> * /proc/net/ip_vs_app entry function
> */
> -#define SEQ_START_TOKEN ((void *)1)
> -
> static struct ip_vs_app *ip_vs_app_idx(loff_t pos)
> {
> loff_t off = 0;
> diff -Nru a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
> --- a/net/ipv4/ipvs/ip_vs_conn.c Tue Sep 16 14:08:11 2003
> +++ b/net/ipv4/ipvs/ip_vs_conn.c Tue Sep 16 14:08:11 2003
> @@ -616,8 +616,6 @@
> */
> #ifdef CONFIG_PROC_FS
>
> -#define SEQ_START_TOKEN ((void *)1)
> -
> static void *ip_vs_conn_array(struct seq_file *seq, loff_t pos)
> {
> struct list_head *e;
> diff -Nru a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
> --- a/net/ipv4/ipvs/ip_vs_ctl.c Tue Sep 16 14:08:11 2003
> +++ b/net/ipv4/ipvs/ip_vs_ctl.c Tue Sep 16 14:08:11 2003
> @@ -1516,8 +1516,6 @@
> int bucket;
> };
>
> -
> -#define SEQ_START_TOKEN ((void *)1)
> /*
> * Write the contents of the VS rule table to a PROCfs file.
> * (It is kept just for backward compatibility)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] (1/6) ipvs -- get rid of SEQ_START_TOKEN define
2003-09-17 15:59 ` Wensong Zhang
@ 2003-09-20 8:04 ` David S. Miller
0 siblings, 0 replies; 3+ messages in thread
From: David S. Miller @ 2003-09-20 8:04 UTC (permalink / raw)
To: Wensong Zhang; +Cc: shemminger, lvs-users, netdev
On Wed, 17 Sep 2003 23:59:46 +0800 (CST)
Wensong Zhang <wensong@linux-vs.org> wrote:
> On Tue, 16 Sep 2003, Stephen Hemminger wrote:
>
> > Applies to 2.6.0-test5 with my seq_file patches from yesterday.
>
> OK, thanks!
>
> Dave, please apply this patch.
Done.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-09-20 8:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-09-16 21:17 [PATCH] (1/6) ipvs -- get rid of SEQ_START_TOKEN define Stephen Hemminger
2003-09-17 15:59 ` Wensong Zhang
2003-09-20 8:04 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).