drbd: split off drbd_buildtag into separate file
authorChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Fri, 13 Jan 2023 12:35:04 +0000 (13:35 +0100)
committerJens Axboe <axboe@kernel.dk>
Sun, 29 Jan 2023 22:18:33 +0000 (15:18 -0700)
To be more similar to what we do in the out-of-tree module and ease the
upstreaming process.

Signed-off-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
Reviewed-by: Joel Colledge <joel.colledge@linbit.com>
Link: https://lore.kernel.org/r/20230113123506.144082-2-christoph.boehmwalder@linbit.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/drbd/Makefile
drivers/block/drbd/drbd_buildtag.c [new file with mode: 0644]
drivers/block/drbd/drbd_main.c

index c93e462..67a8b35 100644 (file)
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-drbd-y := drbd_bitmap.o drbd_proc.o
+drbd-y := drbd_buildtag.o drbd_bitmap.o drbd_proc.o
 drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o
 drbd-y += drbd_main.o drbd_strings.o drbd_nl.o
 drbd-y += drbd_interval.o drbd_state.o
diff --git a/drivers/block/drbd/drbd_buildtag.c b/drivers/block/drbd/drbd_buildtag.c
new file mode 100644 (file)
index 0000000..956a4d5
--- /dev/null
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <linux/drbd.h>
+#include <linux/module.h>
+
+const char *drbd_buildtag(void)
+{
+       /* DRBD built from external sources has here a reference to the
+        * git hash of the source code.
+        */
+
+       static char buildtag[38] = "\0uilt-in";
+
+       if (buildtag[0] == 0) {
+#ifdef MODULE
+               sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
+#else
+               buildtag[0] = 'b';
+#endif
+       }
+
+       return buildtag;
+}
index e43dfb9..af93091 100644 (file)
@@ -3776,24 +3776,6 @@ _drbd_insert_fault(struct drbd_device *device, unsigned int type)
 }
 #endif
 
-const char *drbd_buildtag(void)
-{
-       /* DRBD built from external sources has here a reference to the
-          git hash of the source code. */
-
-       static char buildtag[38] = "\0uilt-in";
-
-       if (buildtag[0] == 0) {
-#ifdef MODULE
-               sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
-#else
-               buildtag[0] = 'b';
-#endif
-       }
-
-       return buildtag;
-}
-
 module_init(drbd_init)
 module_exit(drbd_cleanup)