compat: test and compat patch for bdev_nr_sectors

LINBIT · May 9, 2022 · ba8c076 · ba8c076
1 parent 3c776e5
commit ba8c076
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/drbd/drbd-kernel-compat/cocci/bdev_nr_sectors__no_present.cocci b/drbd/drbd-kernel-compat/cocci/bdev_nr_sectors__no_present.cocci
@@ -0,0 +1,5 @@
+@@
+struct block_device *bd;
+@@
+- bdev_nr_sectors(bd)
++ get_capacity(bd->bd_disk)
diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
@@ -439,6 +439,9 @@ int main(int argc, char **argv)
 	patch(1, "add_disk", true, false,
 	      COMPAT_ADD_DISK_RETURNS_INT, "returns_int");
 
+	patch(1, "bdev_nr_sectors", true, false,
+	      COMPAT_HAVE_BDEV_NR_SECTORS, "present");
+
 /* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
 /* #define BLKDEV_ZERO_NOUNMAP */
 

diff --git a/drbd/drbd-kernel-compat/tests/have_bdev_nr_sectors.c b/drbd/drbd-kernel-compat/tests/have_bdev_nr_sectors.c
@@ -0,0 +1,8 @@
+/* { "version": "v5.10-rc5", "commit": "a782483cc1f875355690625d8253a232f2581418", "comment": "the bdev_nr_sectors helper was introduced", "author": "Christoph Hellwig <hch@lst.de>", "date": "Thu Nov 26 18:43:37 2020 +0100" } */
+
+#include <linux/blkdev.h>
+
+sector_t foo(struct block_device *bdev)
+{
+	return bdev_nr_sectors(bdev);
+}