linux-kernel - [PATCH] block: cfq-iosched: fix unused 'cpd_to

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 19 Jun 2015 01:33:13 +0300
From:	Vladimir Zapolskiy <vz@...ia.com>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	linux-kernel@...r.kernel.org
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 <vz@...ia.com>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/