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 <[email protected]>
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 <[email protected]>
Fixes: d67ae825a59d6 ("pnfs/flexfiles: Add the FlexFile Layout Driver")
Cc: Tom Haynes <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
---
include/linux/sunrpc/metrics.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
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) {}
--
2.1.0
--
Trond Myklebust
Linux NFS client maintainer, PrimaryData
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
