2015-06-18 22:33:25

by Vladimir Zapolskiy

Subject: [PATCH] block: cfq-iosched: fix unused 'cpd_to_cfqgd' function warning

If CFQ_GROUP_IOSCHED kernel option is not set, a compiler produces the
following warning:

CC block/cfq-iosched.o
linux/block/cfq-iosched.c:469:2:
warning: 'cpd_to_cfqgd' defined but not used [-Wunused-function]
*cpd_to_cfqgd(struct blkcg_policy_data *cpd)
^

Define this function only if CFQ_GROUP_IOSCHED is set and remove
the compilation warning.

Signed-off-by: Vladimir Zapolskiy <[email protected]>
---
block/cfq-iosched.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 64d59a5..9c294cd 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -465,11 +465,12 @@ static inline struct cfq_group *pd_to_cfqg(struct blkg_policy_data *pd)
return pd ? container_of(pd, struct cfq_group, pd) : NULL;
}

-static struct cfq_group_data
-*cpd_to_cfqgd(struct blkcg_policy_data *cpd)
+#ifdef CONFIG_CFQ_GROUP_IOSCHED
+static struct cfq_group_data *cpd_to_cfqgd(struct blkcg_policy_data *cpd)
{
return cpd ? container_of(cpd, struct cfq_group_data, pd) : NULL;
}
+#endif

static inline struct blkcg_gq *cfqg_to_blkg(struct cfq_group *cfqg)
{
--
2.1.4

2015-06-19 16:15:46

by Jens Axboe

Subject: Re: [PATCH] block: cfq-iosched: fix unused 'cpd_to_cfqgd' function warning

On 06/18/2015 04:33 PM, Vladimir Zapolskiy wrote:
> If CFQ_GROUP_IOSCHED kernel option is not set, a compiler produces the
> following warning:
>
> CC block/cfq-iosched.o
> linux/block/cfq-iosched.c:469:2:
> warning: 'cpd_to_cfqgd' defined but not used [-Wunused-function]
> *cpd_to_cfqgd(struct blkcg_policy_data *cpd)
> ^
>
> Define this function only if CFQ_GROUP_IOSCHED is set and remove
> the compilation warning.

The two other related functions aren't used either if group scheduling
isn't enabled. I committed this instead:

http://git.kernel.dk/cgit/linux-block/commit/?h=for-4.2/core&id=4ceab71b9d84e55b59a76b54b2999dc377aae6e6

--
Jens Axboe