tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drbd: drop API_VERSION define

Use the genetlink api version as defined in drbd_genl_api.h.

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-3-christoph.boehmwalder@linbit.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Böhmwalder and committed by
Jens Axboe 4e2da933 887b98c7

+4 -5
+1 -1
drivers/block/drbd/drbd_debugfs.c
··· 844 844 { 845 845 seq_printf(m, "# %s\n", drbd_buildtag()); 846 846 seq_printf(m, "VERSION=%s\n", REL_VERSION); 847 - seq_printf(m, "API_VERSION=%u\n", API_VERSION); 847 + seq_printf(m, "API_VERSION=%u\n", GENL_MAGIC_VERSION); 848 848 seq_printf(m, "PRO_VERSION_MIN=%u\n", PRO_VERSION_MIN); 849 849 seq_printf(m, "PRO_VERSION_MAX=%u\n", PRO_VERSION_MAX); 850 850 return 0;
+1 -1
drivers/block/drbd/drbd_main.c
··· 2899 2899 2900 2900 pr_info("initialized. " 2901 2901 "Version: " REL_VERSION " (api:%d/proto:%d-%d)\n", 2902 - API_VERSION, PRO_VERSION_MIN, PRO_VERSION_MAX); 2902 + GENL_MAGIC_VERSION, PRO_VERSION_MIN, PRO_VERSION_MAX); 2903 2903 pr_info("%s\n", drbd_buildtag()); 2904 2904 pr_info("registered as block device major %d\n", DRBD_MAJOR); 2905 2905 return 0; /* Success! */
+1 -1
drivers/block/drbd/drbd_proc.c
··· 228 228 }; 229 229 230 230 seq_printf(seq, "version: " REL_VERSION " (api:%d/proto:%d-%d)\n%s\n", 231 - API_VERSION, PRO_VERSION_MIN, PRO_VERSION_MAX, drbd_buildtag()); 231 + GENL_MAGIC_VERSION, PRO_VERSION_MIN, PRO_VERSION_MAX, drbd_buildtag()); 232 232 233 233 /* 234 234 cs .. connection state
-1
include/linux/drbd.h
··· 40 40 41 41 extern const char *drbd_buildtag(void); 42 42 #define REL_VERSION "8.4.11" 43 - #define API_VERSION 1 44 43 #define PRO_VERSION_MIN 86 45 44 #define PRO_VERSION_MAX 101 46 45
+1 -1
include/linux/drbd_genl_api.h
··· 47 47 #undef linux 48 48 49 49 #include <linux/drbd.h> 50 - #define GENL_MAGIC_VERSION API_VERSION 50 + #define GENL_MAGIC_VERSION 1 51 51 #define GENL_MAGIC_FAMILY drbd 52 52 #define GENL_MAGIC_FAMILY_HDRSZ sizeof(struct drbd_genlmsghdr) 53 53 #define GENL_MAGIC_INCLUDE_FILE <linux/drbd_genl.h>