2013-03-04 19:43:59

by Alexandru Gheorghiu

[permalink] [raw]
Subject: [PATCH] net: netfilter: nfnetlink: Fixed warning for nfnl_get_lock

Removed unused function nfnl_get_lock which fixed the following warning:
net/netfilter/nfnetlink.c:65:22: warning: ‘nfnl_get_lock’ defined but not used [-Wunused-function]

Signed-off-by: Alexandru Gheorghiu <[email protected]>
---
net/netfilter/nfnetlink.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index d578ec2..44aa0a7 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -62,11 +62,6 @@ void nfnl_unlock(__u8 subsys_id)
}
EXPORT_SYMBOL_GPL(nfnl_unlock);

-static struct mutex *nfnl_get_lock(__u8 subsys_id)
-{
- return &table[subsys_id].mutex;
-}
-
int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)
{
nfnl_lock(n->subsys_id);
--
1.7.9.5


2013-03-04 21:06:13

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH] net: netfilter: nfnetlink: Fixed warning for nfnl_get_lock

On Mon, Mar 04, 2013 at 09:43:11PM +0200, Alexandru Gheorghiu wrote:
> Removed unused function nfnl_get_lock which fixed the following warning:
> net/netfilter/nfnetlink.c:65:22: warning: ‘nfnl_get_lock’ defined but not used [-Wunused-function]
>
> Signed-off-by: Alexandru Gheorghiu <[email protected]>
> ---
> net/netfilter/nfnetlink.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
> index d578ec2..44aa0a7 100644
> --- a/net/netfilter/nfnetlink.c
> +++ b/net/netfilter/nfnetlink.c
> @@ -62,11 +62,6 @@ void nfnl_unlock(__u8 subsys_id)
> }
> EXPORT_SYMBOL_GPL(nfnl_unlock);
>
> -static struct mutex *nfnl_get_lock(__u8 subsys_id)
> -{
> - return &table[subsys_id].mutex;
> -}
> -

I see the same warning here, gcc (Debian 4.7.2-5) 4.7.2.

Actually this function *is* used a bit further in the same file in
nfnetlink_rcv_msg().

But gcc complains for some reason of which I don't even have the
slightest idea. However, if you declare the above function "static
inline..." the warning is gone.

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

2013-03-04 21:23:56

by Pablo Neira Ayuso

[permalink] [raw]
Subject: Re: [PATCH] net: netfilter: nfnetlink: Fixed warning for nfnl_get_lock

On Mon, Mar 04, 2013 at 10:05:51PM +0100, Borislav Petkov wrote:
> On Mon, Mar 04, 2013 at 09:43:11PM +0200, Alexandru Gheorghiu wrote:
> > Removed unused function nfnl_get_lock which fixed the following warning:
> > net/netfilter/nfnetlink.c:65:22: warning: ‘nfnl_get_lock’ defined but not used [-Wunused-function]
> >
> > Signed-off-by: Alexandru Gheorghiu <[email protected]>
> > ---
> > net/netfilter/nfnetlink.c | 5 -----
> > 1 file changed, 5 deletions(-)
> >
> > diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
> > index d578ec2..44aa0a7 100644
> > --- a/net/netfilter/nfnetlink.c
> > +++ b/net/netfilter/nfnetlink.c
> > @@ -62,11 +62,6 @@ void nfnl_unlock(__u8 subsys_id)
> > }
> > EXPORT_SYMBOL_GPL(nfnl_unlock);
> >
> > -static struct mutex *nfnl_get_lock(__u8 subsys_id)
> > -{
> > - return &table[subsys_id].mutex;
> > -}
> > -
>
> I see the same warning here, gcc (Debian 4.7.2-5) 4.7.2.
>
> Actually this function *is* used a bit further in the same file in
> nfnetlink_rcv_msg().
>
> But gcc complains for some reason of which I don't even have the
> slightest idea. However, if you declare the above function "static
> inline..." the warning is gone.

Already got a fix for compilation warning in my tree:

http://1984.lsi.us.es/git/nf/commit/?id=9df9e7832391cf699abbf39fc8d95d7e78297462

Thanks!

2013-03-04 21:42:48

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH] net: netfilter: nfnetlink: Fixed warning for nfnl_get_lock

On Mon, Mar 04, 2013 at 10:23:38PM +0100, Pablo Neira Ayuso wrote:
> Already got a fix for compilation warning in my tree:
>
> http://1984.lsi.us.es/git/nf/commit/?id=9df9e7832391cf699abbf39fc8d95d7e78297462

And it even explains why gcc complains.

Thanks.

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--