Skip to contentSkip to conversation

blk-cgroup: provide stubs for blkcg_get_fc_appid()

PATCH In review Hannes Reinecke 3 participants 5 messages May 19, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 blk-cgroup: provide stubs for blkcg_get_fc_appid()

Provide stubs for blkcg_set_fc_appid() and blkcg_get_fc_appid() to allow for compilation with cgroups disabled.

Fixes db05628435aa ("blk-cgroup: move blkcg_{get,set}_fc_appid out of line")
---
 include/linux/blk-cgroup.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
include/linux/blk-cgroup.h +12 -3
index 9f40dbc65f82..4756f4d2b8e7 100644
@@ -33,6 +33,9 @@ void blkcg_unpin_online(struct cgroup_subsys_state *blkcg_css);
 struct list_head *blkcg_get_cgwb_list(struct cgroup_subsys_state *css);
 struct cgroup_subsys_state *bio_blkcg_css(struct bio *bio);
 
+int blkcg_set_fc_appid(char *app_id, u64 cgrp_id, size_t app_id_len);
+char *blkcg_get_fc_appid(struct bio *bio);
+
 #else	/* CONFIG_BLK_CGROUP */
 
 #define blkcg_root_css	((struct cgroup_subsys_state *)ERR_PTR(-EINVAL))
@@ -44,9 +47,15 @@ static inline struct cgroup_subsys_state *bio_blkcg_css(struct bio *bio)
 {
 	return NULL;
 }
+static inline int blkcg_set_fc_appid(char *app_id, u64 cgrp_id,
+				     size_t app_id_len)
+{
+	return -EINVAL;
+}
+static inline char *blkcg_get_fc_appid(struct bio *bio)
+{
+	return NULL;
+}
 #endif	/* CONFIG_BLK_CGROUP */
 
-int blkcg_set_fc_appid(char *app_id, u64 cgrp_id, size_t app_id_len);
-char *blkcg_get_fc_appid(struct bio *bio);
-
 #endif	/* _BLK_CGROUP_H */
Signature · 1 line
2.29.2
#1 lore raw
Quoted 5 lines · Hannes Reinecke

Provide stubs for blkcg_set_fc_appid() and blkcg_get_fc_appid() to allow for compilation with cgroups disabled.

Fixes db05628435aa ("blk-cgroup: move blkcg_{get,set}_fc_appid out of line")

No, it does not fix that commit, which is perfectly fine. It fixes the recently added second caller of blkcg_get_fc_appid, and James has just resent a new version of that which fixes this properly.

#2 lore raw
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Hannes Reinecke

Provide stubs for blkcg_set_fc_appid() and blkcg_get_fc_appid() to allow for compilation with cgroups disabled.

Fixes db05628435aa ("blk-cgroup: move blkcg_{get,set}_fc_appid out of line")

No, it does not fix that commit, which is perfectly fine. It fixes the recently added second caller of blkcg_get_fc_appid, and James has just resent a new version of that which fixes this properly.

Really? blk-cgroup.h provides the function declaration blkcg_get_fc_appid() unconditionally, but the implementation for blkcg_get_fc_appid() depends on CONFIG_CGROUP. Neither of which is changed by James patchset.

And besides, the first version is already merged.

Am I missing something?

Cheers,

Hannes

Signature · 5 lines
Dr. Hannes Reinecke                Kernel Storage Architect
[email protected]                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew
Myers, Andrew McDonald, Martje Boudien Moerman
#3 lore raw
Quoted 8 lines · Hannes Reinecke
Quoted 4 lines

No, it does not fix that commit, which is perfectly fine. It fixes the recently added second caller of blkcg_get_fc_appid, and James has just resent a new version of that which fixes this properly.

Really? blk-cgroup.h provides the function declaration blkcg_get_fc_appid() unconditionally, but the implementation for blkcg_get_fc_appid() depends on CONFIG_CGROUP.

Take a look at the IS_ENABLED macro that we have for a few years now.

Quoted 5 lines

Neither of which is changed by James patchset.

And besides, the first version is already merged.

Am I missing something?

https://lore.kernel.org/linux-scsi/[email protected]/T/#t

maintainer
#4 lore raw
In reply to Hannes Reinecke
Quoted 4 lines · Hannes Reinecke

Provide stubs for blkcg_set_fc_appid() and blkcg_get_fc_appid() to allow for compilation with cgroups disabled.

Fixes db05628435aa ("blk-cgroup: move blkcg_{get,set}_fc_appid out of line")

This isn't a valid sha.

Signature · 1 line
Jens Axboe