2013-01-15 07:42:08

by Mika Westerberg

Subject: [PATCH 1/2] svcrpc: fix compile warning about unused variable 'buf'

Commit 7032a3dd923 (svcrpc: demote some printks to a dprintk) changed the
printk to a dprintk() macro. Since the macro is not always available we get
following compile warning:

net/sunrpc/svc.c: In function ‘svc_printk’:
net/sunrpc/svc.c:1050:8: warning: unused variable ‘buf’ [-Wunused-variable]

Fix this by marking the 'buf' with __maybe_unused.

In addition make checkpatch.pl happy by removing space before tab after
'char'.

Signed-off-by: Mika Westerberg <[email protected]>
---
net/sunrpc/svc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index dbf12ac..2387ec8 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1047,7 +1047,7 @@ void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...)
{
struct va_format vaf;
va_list args;
- char buf[RPC_MAX_ADDRBUFLEN];
+ char buf[RPC_MAX_ADDRBUFLEN] __maybe_unused;

va_start(args, fmt);

--
1.7.10.4

2013-01-15 07:42:07

by Mika Westerberg

Subject: [PATCH 2/2] nfsd: fix compile warning about unused variable 'nn'

Commit c9a4962881 (nfsd: make client_lock per net) added
lockdep_assert_held() call to function free_client(). However, if lockdep
is disabled we get following compiler warning:

fs/nfsd/nfs4state.c: In function ‘free_client’:
fs/nfsd/nfs4state.c:1051:19: warning: unused variable ‘nn’ [-Wunused-variable]

Fix this by marking the 'nn' with __maybe_unused.

Signed-off-by: Mika Westerberg <[email protected]>
---
fs/nfsd/nfs4state.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index ac8ed96..2d3011c 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1048,7 +1048,7 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name)
static inline void
free_client(struct nfs4_client *clp)
{
- struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);
+ struct nfsd_net *nn __maybe_unused = net_generic(clp->net, nfsd_net_id);

lockdep_assert_held(&nn->client_lock);
while (!list_empty(&clp->cl_sessions)) {
--
1.7.10.4

2013-01-16 21:57:23

by J. Bruce Fields

Subject: Re: [PATCH 2/2] nfsd: fix compile warning about unused variable 'nn'

On Tue, Jan 15, 2013 at 09:43:07AM +0200, Mika Westerberg wrote:
> Commit c9a4962881 (nfsd: make client_lock per net) added
> lockdep_assert_held() call to function free_client(). However, if lockdep
> is disabled we get following compiler warning:
>
> fs/nfsd/nfs4state.c: In function ‘free_client’:
> fs/nfsd/nfs4state.c:1051:19: warning: unused variable ‘nn’ [-Wunused-variable]
>
> Fix this by marking the 'nn' with __maybe_unused.

I queued up fixes for these for 3.9 on the assumption it's better to
live with the compile errors a little longer than to submit unimportant
stuff for post-merge-window 3.8.

But if it means more people are going to waste time tripping over these,
then maybe they should just go in now--I don't know.

--b.

>
> Signed-off-by: Mika Westerberg <[email protected]>
> ---
> fs/nfsd/nfs4state.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index ac8ed96..2d3011c 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -1048,7 +1048,7 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name)
> static inline void
> free_client(struct nfs4_client *clp)
> {
> - struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);
> + struct nfsd_net *nn __maybe_unused = net_generic(clp->net, nfsd_net_id);
>
> lockdep_assert_held(&nn->client_lock);
> while (!list_empty(&clp->cl_sessions)) {
> --
> 1.7.10.4
>