block/rnbd: fix mixed module-builtin object
Subsystems (2)
PATCH 1/1 block/rnbd: fix mixed module-builtin object
With CONFIG_BLK_DEV_RNBD_CLIENT=m and CONFIG_BLK_DEV_RNBD_SERVER=y (or vice versa), rnbd-common.o is linked to a module and also to vmlinux even though CFLAGS are different between builtins and modules.
This is the same situation as fixed by commit 637a642f5ca5 ("zstd:
Fixing mixed module-builtin objects").
Turn rnbd_access_mode_str() into an inline function.
---
drivers/block/rnbd/Makefile | 6 ++---- drivers/block/rnbd/rnbd-common.c | 23 ----------------------- drivers/block/rnbd/rnbd-proto.h | 14 +++++++++++++- 3 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 drivers/block/rnbd/rnbd-common.c
drivers/block/rnbd/Makefile +2 -4
@@ -3,13 +3,11 @@ ccflags-y := -I$(srctree)/drivers/infiniband/ulp/rtrs rnbd-client-y := rnbd-clt.o \ - rnbd-clt-sysfs.o \ - rnbd-common.o + rnbd-clt-sysfs.o CFLAGS_rnbd-srv-trace.o = -I$(src) -rnbd-server-y := rnbd-common.o \ - rnbd-srv.o \ +rnbd-server-y := rnbd-srv.o \ rnbd-srv-sysfs.o \ rnbd-srv-trace.o
drivers/block/rnbd/rnbd-common.c deleted +0 -23
@@ -1,23 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* RDMA Network Block Driver -* -* Copyright (c) 2014 - 2018 ProfitBricks GmbH. All rights reserved. -* Copyright (c) 2018 - 2019 1&1 IONOS Cloud GmbH. All rights reserved. -* Copyright (c) 2019 - 2020 1&1 IONOS SE. All rights reserved. -*/ -#include "rnbd-proto.h" - -const char *rnbd_access_mode_str (enum rnbd_access_mode mode) -{ -switch (mode) { -case RNBD_ACCESS_RO : -return "ro" ; -case RNBD_ACCESS_RW : -return "rw" ; -case RNBD_ACCESS_MIGRATION : -return "migration" ; -default : -return "unknown" ; - } -}
drivers/block/rnbd/rnbd-proto.h +13 -1
@@ -300,6 +300,18 @@ static inline u32 rq_to_rnbd_flags(struct request *rq) return rnbd_opf; } -const char *rnbd_access_mode_str (enum rnbd_access_mode mode); +static inline const char *rnbd_access_mode_str (enum rnbd_access_mode mode) +{ +switch (mode) { +case RNBD_ACCESS_RO : +return "ro" ; +case RNBD_ACCESS_RW : +return "rw" ; +case RNBD_ACCESS_MIGRATION : +return "migration" ; +default : +return "unknown" ; + } +}#endif /* RNBD_PROTO_H */
Signature · 1 line
2.39.2
Jinpu Wang
maintainerHi Masahiro,
Quoted 9 lines · Masahiro Yamada
With
CONFIG_BLK_DEV_RNBD_CLIENT=mandCONFIG_BLK_DEV_RNBD_SERVER=y(or vice versa), rnbd-common.o is linked to a module and also to vmlinux even though CFLAGS are different between builtins and modules.This is the same situation as fixed by commit
637a642f5ca5("zstd:
Fixing mixed module-builtin objects").Turn
rnbd_access_mode_str()into an inline function.
Thx for you fix, but Guoqing has a slightly different patch in the queue:
Quoted 88 lines
Signed-off-by Masahiro Yamada <[email protected]>---
drivers/block/rnbd/Makefile | 6 ++---- drivers/block/rnbd/rnbd-common.c | 23 ----------------------- drivers/block/rnbd/rnbd-proto.h | 14 +++++++++++++- 3 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 drivers/block/rnbd/rnbd-common.cdrivers/block/rnbd/Makefile +2
-4@@ -3,13 +3,11 @@ ccflags-y := -I$(srctree)/drivers/infiniband/ulp/rtrs rnbd-client-y := rnbd-clt.o \ - rnbd-clt-sysfs.o \ - rnbd-common.o + rnbd-clt-sysfs.o CFLAGS_rnbd-srv-trace.o = -I$(src) -rnbd-server-y := rnbd-common.o \ - rnbd-srv.o \ +rnbd-server-y := rnbd-srv.o \ rnbd-srv-sysfs.o \ rnbd-srv-trace.odrivers/block/rnbd/rnbd-common.c deleted +0
-23@@ -1,23 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* RDMA Network Block Driver -* -* Copyright (c) 2014 - 2018 ProfitBricks GmbH. All rights reserved. -* Copyright (c) 2018 - 2019 1&1 IONOS Cloud GmbH. All rights reserved. -* Copyright (c) 2019 - 2020 1&1 IONOS SE. All rights reserved. -*/ -#include "rnbd-proto.h" - -const char *rnbd_access_mode_str (enum rnbd_access_mode mode) -{ -switch (mode) { -case RNBD_ACCESS_RO : -return "ro" ; -case RNBD_ACCESS_RW : -return "rw" ; -case RNBD_ACCESS_MIGRATION : -return "migration" ; -default : -return "unknown" ; - } -}drivers/block/rnbd/rnbd-proto.h +13
-2@@ -300,6 +300,18 @@ static inline u32 rq_to_rnbd_flags(struct request *rq) return rnbd_opf; } -const char *rnbd_access_mode_str (enum rnbd_access_mode mode); +static inline const char *rnbd_access_mode_str (enum rnbd_access_mode mode) +{ +switch (mode) { +case RNBD_ACCESS_RO : +return "ro" ; +case RNBD_ACCESS_RW : +return "rw" ; +case RNBD_ACCESS_MIGRATION : +return "migration" ; +default : +return "unknown" ; + } +}#endif /* RNBD_PROTO_H */ --2.39.2
Quoted 10 lines · Jinpu Wang
Hi Masahiro,
Quoted 5 lines · Masahiro Yamada
With
CONFIG_BLK_DEV_RNBD_CLIENT=mandCONFIG_BLK_DEV_RNBD_SERVER=y(or vice versa), rnbd-common.o is linked to a module and also to vmlinux even though CFLAGS are different between builtins and modules.
Quoted 8 lines
Quoted 4 lines
This is the same situation as fixed by commit
637a642f5ca5("zstd:
Fixing mixed module-builtin objects").Turn
rnbd_access_mode_str()into an inline function.Thx for you fix, but Guoqing has a slightly different patch in the queue:
LGTM. Thank you.
Signature · 2 lines
Best Regards Masahiro Yamada