diff mbox

randconfig build error with next-20150209, in fs/nfs/client.c

Message ID 1423748102.4004.2.camel@primarydata.com (mailing list archive)
State New, archived
Headers show

Commit Message

Trond Myklebust Feb. 12, 2015, 1:35 p.m. UTC 
On Mon, 2015-02-09 at 11:00 -0700, Jim Davis wrote:
> Building with the attached random configuration file,
> 
> In file included from fs/nfs/client.c:25:0:
> include/linux/sunrpc/metrics.h: In function ‘rpc_count_iostats_metrics’:
> include/linux/sunrpc/metrics.h:92:59: error: parameter name omitted
>  static inline void rpc_count_iostats_metrics(const struct rpc_task *,
>                                                            ^
> include/linux/sunrpc/metrics.h:93:18: error: parameter name omitted
>            struct rpc_iostats *) {}
>                   ^
>   CC      net/ipv4/ip_vti.o
>   CC      net/ipv6/addrconf_core.o
> make[2]: *** [fs/nfs/client.o] Error 1

Thanks for the report! I'm adding the following fix to my linux-next
branch and will push it to Linus before the merge window ends.

8<------------------------------------------------------------------
From 54d7e72a758609da5936d7452320d799cfc6a25c Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Thu, 12 Feb 2015 08:28:12 -0500
Subject: [PATCH] SUNRPC: Fix a compile error when #undef CONFIG_PROC_FS

The definition of rpc_count_iostats_metrics() is borked.

Reported by: Jim Davis <jim.epost@gmail.com>
Fixes: d67ae825a59d6 ("pnfs/flexfiles: Add the FlexFile Layout Driver")
Cc: Tom Haynes <thomas.haynes@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 include/linux/sunrpc/metrics.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Geert Uytterhoeven Feb. 12, 2015, 2:21 p.m. UTC | #1 
On Thu, Feb 12, 2015 at 2:35 PM, Trond Myklebust
<trond.myklebust@primarydata.com> wrote:
>> include/linux/sunrpc/metrics.h:93:18: error: parameter name omitted
>>            struct rpc_iostats *) {}
>>                   ^
>>   CC      net/ipv4/ip_vti.o
>>   CC      net/ipv6/addrconf_core.o
>> make[2]: *** [fs/nfs/client.o] Error 1
>
> Thanks for the report! I'm adding the following fix to my linux-next
> branch and will push it to Linus before the merge window ends.

Thanks! I was just gonna git-send-email a similar patch...
>
> 8<------------------------------------------------------------------
> From 54d7e72a758609da5936d7452320d799cfc6a25c Mon Sep 17 00:00:00 2001
> From: Trond Myklebust <trond.myklebust@primarydata.com>
> Date: Thu, 12 Feb 2015 08:28:12 -0500
> Subject: [PATCH] SUNRPC: Fix a compile error when #undef CONFIG_PROC_FS
>
> The definition of rpc_count_iostats_metrics() is borked.
>
> Reported by: Jim Davis <jim.epost@gmail.com>
> Fixes: d67ae825a59d6 ("pnfs/flexfiles: Add the FlexFile Layout Driver")
> Cc: Tom Haynes <thomas.haynes@primarydata.com>
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/linux/sunrpc/metrics.h b/include/linux/sunrpc/metrics.h
index 7e61a17030a4..694eecb2f1b5 100644
--- a/include/linux/sunrpc/metrics.h
+++ b/include/linux/sunrpc/metrics.h
@@ -89,8 +89,11 @@  void			rpc_free_iostats(struct rpc_iostats *);
 static inline struct rpc_iostats *rpc_alloc_iostats(struct rpc_clnt *clnt) { return NULL; }
 static inline void rpc_count_iostats(const struct rpc_task *task,
 				     struct rpc_iostats *stats) {}
-static inline void rpc_count_iostats_metrics(const struct rpc_task *,
-					     struct rpc_iostats *) {}
+static inline void rpc_count_iostats_metrics(const struct rpc_task *task,
+					     struct rpc_iostats *stats)
+{
+}
+
 static inline void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt) {}
 static inline void rpc_free_iostats(struct rpc_iostats *stats) {}