[PATCH] kernel panic with rpc.patch

[PATCH] kernel panic with rpc.patch

[Phil Oester]

[-- Attachment #1: Type: text/plain, Size: 142 bytes --]

Some useless __MOD_INC_USE_COUNT macros make rpc patch panic on boot.
The below removes them.  Boot tested.

This fixes bugzilla #50


Phil



[-- Attachment #2: patch-rpc --]
[-- Type: text/plain, Size: 550 bytes --]

diff -ru pom-orig/rpc/linux/net/ipv4/netfilter/ipt_rpc.c pom-new/rpc/linux/net/ipv4/netfilter/ipt_rpc.c
--- pom-orig/rpc/linux/net/ipv4/netfilter/ipt_rpc.c	2003-12-18 13:48:00.000000000 -0500
+++ pom-new/rpc/linux/net/ipv4/netfilter/ipt_rpc.c	2004-09-02 19:09:56.599859208 -0400
@@ -394,10 +394,6 @@
 {
 	int port;
 
-	DEBUGP("incrementing usage counts\n");
-	__MOD_INC_USE_COUNT(ip_conntrack_rpc_udp);
-	__MOD_INC_USE_COUNT(ip_conntrack_rpc_tcp);
-
 	/* If no port given, default to standard RPC port */
 	if (ports[0] == 0)
 		ports[0] = RPC_PORT;

Re: [PATCH] kernel panic with rpc.patch

[Patrick McHardy]

Phil Oester wrote:

>Some useless __MOD_INC_USE_COUNT macros make rpc patch panic on boot.
>The below removes them.  Boot tested.
>
>This fixes bugzilla #50
>  
>

Applied, but wondering on second thought. There are still two
__MOD_DEC_USE_COUNT left, and __MOD_INC_USE_COUNT does actually
do something :) Why are they useless ?

Regards
Patrick

>
>
>Phil
>
>
>  
>
>------------------------------------------------------------------------
>
>diff -ru pom-orig/rpc/linux/net/ipv4/netfilter/ipt_rpc.c pom-new/rpc/linux/net/ipv4/netfilter/ipt_rpc.c
>--- pom-orig/rpc/linux/net/ipv4/netfilter/ipt_rpc.c	2003-12-18 13:48:00.000000000 -0500
>+++ pom-new/rpc/linux/net/ipv4/netfilter/ipt_rpc.c	2004-09-02 19:09:56.599859208 -0400
>@@ -394,10 +394,6 @@
> {
> 	int port;
> 
>-	DEBUGP("incrementing usage counts\n");
>-	__MOD_INC_USE_COUNT(ip_conntrack_rpc_udp);
>-	__MOD_INC_USE_COUNT(ip_conntrack_rpc_tcp);
>-
> 	/* If no port given, default to standard RPC port */
> 	if (ports[0] == 0)
> 		ports[0] = RPC_PORT;
>  
>

Re: [PATCH] kernel panic with rpc.patch

[Phil Oester]

[-- Attachment #1: Type: text/plain, Size: 794 bytes --]

On Fri, Sep 03, 2004 at 03:52:13AM +0200, Patrick McHardy wrote:
> Phil Oester wrote:
> 
> >Some useless __MOD_INC_USE_COUNT macros make rpc patch panic on boot.
> >The below removes them.  Boot tested.
> 
> Applied, but wondering on second thought. There are still two
> __MOD_DEC_USE_COUNT left, and __MOD_INC_USE_COUNT does actually
> do something :) Why are they useless ?

Yes, perhaps 'useless' is the wrong word -- they do something, but 
something which is deprecated and in 2.6 netfilter nonexistent. And
following davem's policy of no refcounts for network drivers [1], it
seems to make sense.

Agreed, however, that removing the INC without also removing the DEC
is sloppy.  Attached find a patch to do so.

Phil

[1] http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.3/0403.html



[-- Attachment #2: patch-rpc2 --]
[-- Type: text/plain, Size: 514 bytes --]

diff -ru pom-orig/rpc/linux/net/ipv4/netfilter/ipt_rpc.c pom-new/rpc/linux/net/ipv4/netfilter/ipt_rpc.c
--- pom-orig/rpc/linux/net/ipv4/netfilter/ipt_rpc.c	2004-09-03 00:17:53.859176224 -0400
+++ pom-new/rpc/linux/net/ipv4/netfilter/ipt_rpc.c	2004-09-03 00:17:41.524051448 -0400
@@ -412,10 +412,6 @@
 {
 	DEBUGP("unregistering match\n");
 	ipt_unregister_match(&rpc_match);
-
-	DEBUGP("decrementing usage counts\n");
-	__MOD_DEC_USE_COUNT(ip_conntrack_rpc_tcp);
-	__MOD_DEC_USE_COUNT(ip_conntrack_rpc_udp);
 }
 
 

Re: [PATCH] kernel panic with rpc.patch

[Patrick McHardy]

Phil Oester wrote:

>On Fri, Sep 03, 2004 at 03:52:13AM +0200, Patrick McHardy wrote:
>
>>Applied, but wondering on second thought. There are still two
>>__MOD_DEC_USE_COUNT left, and __MOD_INC_USE_COUNT does actually
>>do something :) Why are they useless ?
>>    
>>
>
>Yes, perhaps 'useless' is the wrong word -- they do something, but 
>something which is deprecated and in 2.6 netfilter nonexistent. And
>following davem's policy of no refcounts for network drivers [1], it
>seems to make sense.
>
>Agreed, however, that removing the INC without also removing the DEC
>is sloppy.  Attached find a patch to do so.
>  
>
Thanks, applied.

Regards
Patrick