Sync from SUSE:ALP:Source:Standard:1.0 drbd revision ff49c8c7d655bec5bb993c6337799398

.gitattributes

@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text

0006-drbd-log-numeric-value-of-drbd_state_rv-as-well-as-s.patch

@@ -0,0 +1,82 @@
+From 8c2c783a09d81f0a725e7a3ae48be4ceb2d79a63 Mon Sep 17 00:00:00 2001
+From: Joel Colledge <joel.colledge@linbit.com>
+Date: Fri, 8 Sep 2023 11:26:01 +0200
+Subject: [PATCH 06/20] drbd: log numeric value of drbd_state_rv as well as
+ string form
+
+"Auto-promote failed: ?" was seen in a log. Logging the numeric value of
+the state change return value gives us more information about what
+happened in such a case.
+---
+ drbd/drbd_main.c     | 8 ++++----
+ drbd/drbd_receiver.c | 6 +++---
+ drbd/drbd_state.c    | 3 ++-
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
+index 810df864f60b..e26cf7e2b008 100644
+--- a/drbd/drbd_main.c
++++ b/drbd/drbd_main.c
+@@ -2698,8 +2698,8 @@ static int drbd_open(struct block_device *bdev, fmode_t mode)
+ 			if (resource->role[NOW] == R_SECONDARY) {
+ 				rv = try_to_promote(device, timeout, (mode & FMODE_NDELAY));
+ 				if (rv < SS_SUCCESS)
+-					drbd_info(resource, "Auto-promote failed: %s\n",
+-						  drbd_set_st_err_str(rv));
++					drbd_info(resource, "Auto-promote failed: %s (%d)\n",
++						  drbd_set_st_err_str(rv), rv);
+ 			}
+ 		} else if ((mode & FMODE_NDELAY) == 0) {
+ 			/* Double check peers
+@@ -2856,8 +2856,8 @@ static void drbd_release(struct gendisk *gd, fmode_t mode)
+ 		    !test_bit(EXPLICIT_PRIMARY, &resource->flags)) {
+ 			rv = drbd_set_role(resource, R_SECONDARY, false, NULL);
+ 			if (rv < SS_SUCCESS)
+-				drbd_warn(resource, "Auto-demote failed: %s\n",
+-					  drbd_set_st_err_str(rv));
++				drbd_warn(resource, "Auto-demote failed: %s (%d)\n",
++					  drbd_set_st_err_str(rv), rv);
+ 		}
+ 	}
+ 
+diff --git a/drbd/drbd_receiver.c b/drbd/drbd_receiver.c
+index 95cf7ac36762..2162d13cb25e 100644
+--- a/drbd/drbd_receiver.c
++++ b/drbd/drbd_receiver.c
+@@ -983,8 +983,8 @@ static int connect_work(struct drbd_work *work, int cancel)
+ 		drbd_send_disconnect(connection);
+ 		apply_local_state_change(connection, OUTDATE_DISKS_AND_DISCONNECT, force_demote);
+ 	} else {
+-		drbd_info(connection, "Failure to connect %d %s; retrying\n",
+-			  rv, drbd_set_st_err_str(rv));
++		drbd_info(connection, "Failure to connect: %s (%d); retrying\n",
++			  drbd_set_st_err_str(rv), rv);
+ 		change_cstate(connection, C_NETWORK_FAILURE, CS_HARD);
+ 	}
+ 
+@@ -6107,7 +6107,7 @@ out:
+ 	}
+ 
+ 	if (rv < SS_SUCCESS) {
+-		drbd_err(resource, "State change failed: %s\n", drbd_set_st_err_str(rv));
++		drbd_err(resource, "State change failed: %s (%d)\n", drbd_set_st_err_str(rv), rv);
+ 		if (rv == SS_PRIMARY_READER)
+ 			log_openers(resource);
+ 	}
+diff --git a/drbd/drbd_state.c b/drbd/drbd_state.c
+index 8b60afeb097b..23eab7f867aa 100644
+--- a/drbd/drbd_state.c
++++ b/drbd/drbd_state.c
+@@ -791,7 +791,8 @@ static enum drbd_state_rv ___end_state_change(struct drbd_resource *resource, st
+ 		rv = try_state_change(resource);
+ 	if (rv < SS_SUCCESS) {
+ 		if (flags & CS_VERBOSE) {
+-			drbd_err(resource, "State change failed: %s\n", drbd_set_st_err_str(rv));
++			drbd_err(resource, "State change failed: %s (%d)\n",
++					drbd_set_st_err_str(rv), rv);
+ 			print_state_change(resource, "Failed: ");
+ 		}
+ 		goto out;
+-- 
+2.35.3
+

0008-compat-block-introduce-holder-ops.patch

@@ -0,0 +1,80 @@
+From c34a13c3df85352124e94456f81e3d4ba4f52440 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20=22WanzenBug=22=20Wanzenb=C3=B6ck?=
+ <moritz.wanzenboeck@linbit.com>
+Date: Fri, 8 Sep 2023 12:20:10 +0200
+Subject: [PATCH 08/20] compat: block: introduce holder ops
+
+See also upstream Linux kernel commit
+0718afd47f70 ("block: introduce holder ops")
+
+Original message:
+
+Add a new blk_holder_ops structure, which is passed to blkdev_get_by_* and
+installed in the block_device for exclusive claims.  It will be used to
+allow the block layer to call back into the user of the block device for
+thing like notification of a removed device or a device resize.
+---
+ .../cocci/blkdev_get_by_path__no_has_holder_ops.cocci      | 6 ++++++
+ drbd/drbd-kernel-compat/gen_patch_names.c                  | 3 +++
+ .../tests/blkdev_get_by_path_has_holder_ops.c              | 7 +++++++
+ drbd/drbd_nl.c                                             | 3 ++-
+ 4 files changed, 18 insertions(+), 1 deletion(-)
+ create mode 100644 drbd/drbd-kernel-compat/cocci/blkdev_get_by_path__no_has_holder_ops.cocci
+ create mode 100644 drbd/drbd-kernel-compat/tests/blkdev_get_by_path_has_holder_ops.c
+
+diff --git a/drbd/drbd-kernel-compat/cocci/blkdev_get_by_path__no_has_holder_ops.cocci b/drbd/drbd-kernel-compat/cocci/blkdev_get_by_path__no_has_holder_ops.cocci
+new file mode 100644
+index 000000000000..050d89e6fe0d
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/cocci/blkdev_get_by_path__no_has_holder_ops.cocci
+@@ -0,0 +1,6 @@
++@@
++expression path, mode, holder, ops;
++@@
++  blkdev_get_by_path(path, mode, holder
++-  	, ops
++  )
+diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
+index 959bbc351e1b..7071a0a4c5ec 100644
+--- a/drbd/drbd-kernel-compat/gen_patch_names.c
++++ b/drbd/drbd-kernel-compat/gen_patch_names.c
+@@ -556,6 +556,9 @@ int main(int argc, char **argv)
+ 	patch(1, "__bio_add_page", true, false,
+ 	      COMPAT_HAVE___BIO_ADD_PAGE, "present");
+ 
++	patch(1, "blkdev_get_by_path", true, false,
++	      COMPAT_BLKDEV_GET_BY_PATH_HAS_HOLDER_OPS, "has_holder_ops");
++
+ /* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
+ /* #define BLKDEV_ZERO_NOUNMAP */
+ 
+diff --git a/drbd/drbd-kernel-compat/tests/blkdev_get_by_path_has_holder_ops.c b/drbd/drbd-kernel-compat/tests/blkdev_get_by_path_has_holder_ops.c
+new file mode 100644
+index 000000000000..02a560782f37
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/tests/blkdev_get_by_path_has_holder_ops.c
+@@ -0,0 +1,7 @@
++/* { "version": "v6.5-rc1", "commit": "0718afd47f70cf46877c39c25d06b786e1a3f36c", "comment": "block: introduce holder ops", "author": "Christoph Hellwig <hch@lst.de>", "date": "Thu Jun 1 11:44:52 2023 +0200" } */
++#include <linux/blkdev.h>
++
++struct block_device *foo(const char *bdev_path, struct blk_holder_ops *ops)
++{
++	return blkdev_get_by_path(bdev_path, 0, NULL, ops);
++}
+diff --git a/drbd/drbd_nl.c b/drbd/drbd_nl.c
+index 0fc1d84a996f..0a67bfa4ca52 100644
+--- a/drbd/drbd_nl.c
++++ b/drbd/drbd_nl.c
+@@ -2560,7 +2560,8 @@ static struct block_device *open_backing_dev(struct drbd_device *device,
+ 		const char *bdev_path, void *claim_ptr)
+ {
+ 	struct block_device *bdev = blkdev_get_by_path(bdev_path,
+-				  FMODE_READ | FMODE_WRITE | FMODE_EXCL, claim_ptr);
++				  FMODE_READ | FMODE_WRITE | FMODE_EXCL,
++				  claim_ptr, NULL);
+ 	if (IS_ERR(bdev)) {
+ 		drbd_err(device, "open(\"%s\") failed with %ld\n",
+ 				bdev_path, PTR_ERR(bdev));
+-- 
+2.35.3
+

0011-compat-block-pass-a-gendisk-to-open.patch

@@ -0,0 +1,129 @@
+From b993152e80676f5b9ce583c9471b630cbd0675d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20=22WanzenBug=22=20Wanzenb=C3=B6ck?=
+ <moritz.wanzenboeck@linbit.com>
+Date: Fri, 8 Sep 2023 15:09:47 +0200
+Subject: [PATCH 11/20] compat: block: pass a gendisk to ->open
+
+See also upstream Linux kernel commit
+d32e2bf83791 ("block: pass a gendisk to ->open")
+
+Original message:
+
+->open is only called on the whole device.  Make that explicit by
+passing a gendisk instead of the block_device.
+---
+ ...ice_operations_open__no_takes_gendisk.cocci | 18 ++++++++++++++++++
+ drbd/drbd-kernel-compat/gen_patch_names.c      |  3 +++
+ ...lock_device_operations_open_takes_gendisk.c | 17 +++++++++++++++++
+ drbd/drbd_main.c                               | 10 +++++-----
+ 4 files changed, 43 insertions(+), 5 deletions(-)
+ create mode 100644 drbd/drbd-kernel-compat/cocci/block_device_operations_open__no_takes_gendisk.cocci
+ create mode 100644 drbd/drbd-kernel-compat/tests/block_device_operations_open_takes_gendisk.c
+
+diff --git a/drbd/drbd-kernel-compat/cocci/block_device_operations_open__no_takes_gendisk.cocci b/drbd/drbd-kernel-compat/cocci/block_device_operations_open__no_takes_gendisk.cocci
+new file mode 100644
+index 000000000000..2ba2856da9db
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/cocci/block_device_operations_open__no_takes_gendisk.cocci
+@@ -0,0 +1,18 @@
++@ drbd_open_arg @
++identifier gd;
++fresh identifier bdev = "" ## "bdev";
++@@
++  drbd_open(
++- 	struct gendisk *gd,
+++ 	struct block_device *bdev,
++  ... ) {
++<...
++(
++- 	gd->part0
+++ 	bdev
++|
++- 	gd
+++ 	bdev->bd_disk
++)
++...>
++}
+diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
+index 7071a0a4c5ec..6e4f06d9a3a7 100644
+--- a/drbd/drbd-kernel-compat/gen_patch_names.c
++++ b/drbd/drbd-kernel-compat/gen_patch_names.c
+@@ -559,6 +559,9 @@ int main(int argc, char **argv)
+ 	patch(1, "blkdev_get_by_path", true, false,
+ 	      COMPAT_BLKDEV_GET_BY_PATH_HAS_HOLDER_OPS, "has_holder_ops");
+ 
++	patch(1, "block_device_operations_open", true, false,
++	      COMPAT_BLOCK_DEVICE_OPERATIONS_OPEN_TAKES_GENDISK, "takes_gendisk");
++
+ /* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
+ /* #define BLKDEV_ZERO_NOUNMAP */
+ 
+diff --git a/drbd/drbd-kernel-compat/tests/block_device_operations_open_takes_gendisk.c b/drbd/drbd-kernel-compat/tests/block_device_operations_open_takes_gendisk.c
+new file mode 100644
+index 000000000000..d5f20fd569fb
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/tests/block_device_operations_open_takes_gendisk.c
+@@ -0,0 +1,17 @@
++/* { "version": "v6.5-rc1", "commit": "d32e2bf83791727a84ad5d3e3d713e82f9adbe30", "comment": "block: pass a gendisk to ->open", "author": "Christoph Hellwig <hch@lst.de>", "date": "Thu Jun 8 13:02:36 2023 +0200" } */
++#include <linux/blkdev.h>
++
++#ifndef __same_type
++# define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
++#endif
++
++int foo_open(struct gendisk *disk, unsigned int mode)
++{
++	return 0;
++}
++
++void foo(void)
++{
++	struct block_device_operations ops;
++	BUILD_BUG_ON(!(__same_type(ops.open, &foo_open)));
++}
+diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
+index e6ed1185c710..53cb4c9e7db3 100644
+--- a/drbd/drbd_main.c
++++ b/drbd/drbd_main.c
+@@ -52,7 +52,7 @@
+ #include "drbd_meta_data.h"
+ #include "drbd_dax_pmem.h"
+ 
+-static int drbd_open(struct block_device *bdev, fmode_t mode);
++static int drbd_open(struct gendisk *gd, fmode_t mode);
+ static void drbd_release(struct gendisk *gd, fmode_t mode);
+ static void md_sync_timer_fn(struct timer_list *t);
+ static int w_bitmap_io(struct drbd_work *w, int unused);
+@@ -2646,9 +2646,9 @@ out:
+ 	spin_unlock(&device->openers_lock);
+ }
+ 
+-static int drbd_open(struct block_device *bdev, fmode_t mode)
++static int drbd_open(struct gendisk *gd, fmode_t mode)
+ {
+-	struct drbd_device *device = bdev->bd_disk->private_data;
++	struct drbd_device *device = gd->private_data;
+ 	struct drbd_resource *resource = device->resource;
+ 	long timeout = resource->res_opts.auto_promote_timeout * HZ / 10;
+ 	enum ioc_rv r;
+@@ -2664,7 +2664,7 @@ static int drbd_open(struct block_device *bdev, fmode_t mode)
+ 
+ 	/* Fail read-write open early,
+ 	 * in case someone explicitly set us read-only (blockdev --setro) */
+-	if (bdev_read_only(bdev) && (mode & FMODE_WRITE))
++	if (bdev_read_only(gd->part0) && (mode & FMODE_WRITE))
+ 		return -EACCES;
+ 
+ 	if (resource->fail_io[NOW])
+@@ -2740,7 +2740,7 @@ out:
+ 
+ 	mutex_unlock(&resource->open_release);
+ 	if (err) {
+-		drbd_release(bdev->bd_disk, mode);
++		drbd_release(gd, mode);
+ 		if (err == -EAGAIN && !(mode & FMODE_NDELAY))
+ 			err = -EMEDIUMTYPE;
+ 	}
+-- 
+2.35.3
+

0013-drbd-remove-unused-extern-for-conn_try_outdate_peer.patch

@@ -0,0 +1,38 @@
+From 9e087399533445e3df60a34f26a1e6a285b0504a Mon Sep 17 00:00:00 2001
+From: Joel Colledge <joel.colledge@linbit.com>
+Date: Tue, 12 Sep 2023 16:36:43 +0200
+Subject: [PATCH 13/20] drbd: remove unused extern for conn_try_outdate_peer()
+
+---
+ drbd/drbd_int.h | 1 -
+ drbd/drbd_nl.c  | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drbd/drbd_int.h b/drbd/drbd_int.h
+index 4f3228d5a4d1..f6e7c3ac2629 100644
+--- a/drbd/drbd_int.h
++++ b/drbd/drbd_int.h
+@@ -1932,7 +1932,6 @@ extern void drbd_reconsider_queue_parameters(struct drbd_device *device,
+ 			struct drbd_backing_dev *bdev);
+ extern bool barrier_pending(struct drbd_resource *resource);
+ extern enum drbd_state_rv drbd_set_role(struct drbd_resource *, enum drbd_role, bool, struct sk_buff *);
+-extern bool conn_try_outdate_peer(struct drbd_connection *connection);
+ extern void conn_try_outdate_peer_async(struct drbd_connection *connection);
+ extern int drbd_maybe_khelper(struct drbd_device *, struct drbd_connection *, char *);
+ extern int drbd_create_peer_device_default_config(struct drbd_peer_device *peer_device);
+diff --git a/drbd/drbd_nl.c b/drbd/drbd_nl.c
+index 0a67bfa4ca52..cb5cdb184824 100644
+--- a/drbd/drbd_nl.c
++++ b/drbd/drbd_nl.c
+@@ -768,7 +768,7 @@ static bool intentional_diskless(struct drbd_resource *resource)
+ 	return intentional_diskless;
+ }
+ 
+-bool conn_try_outdate_peer(struct drbd_connection *connection)
++static bool conn_try_outdate_peer(struct drbd_connection *connection)
+ {
+ 	struct drbd_resource *resource = connection->resource;
+ 	unsigned long last_reconnect_jif;
+-- 
+2.35.3
+

0015-compat-block-use-the-holder-as-indication-for-exclus.patch

@@ -0,0 +1,202 @@
+From 3b9fcc2cfaa32766724f371cc2054e057adbc425 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20=22WanzenBug=22=20Wanzenb=C3=B6ck?=
+ <moritz.wanzenboeck@linbit.com>
+Date: Mon, 11 Sep 2023 13:36:07 +0200
+Subject: [PATCH 15/20] compat: block: use the holder as indication for
+ exclusive opens
+
+See also upstream Linux kernel commit
+2736e8eeb0cc ("block: use the holder as indication for exclusive opens")
+Original message:
+
+The current interface for exclusive opens is rather confusing as it
+requires both the FMODE_EXCL flag and a holder.  Remove the need to pass
+FMODE_EXCL and just key off the exclusive open off a non-NULL holder.
+
+For blkdev_put this requires adding the holder argument, which provides
+better debug checking that only the holder actually releases the hold,
+but at the same time allows removing the now superfluous mode argument.
+---
+ .../cocci/blkdev_put__no_has_holder.cocci     | 38 +++++++++++++++++++
+ drbd/drbd-kernel-compat/gen_patch_names.c     |  3 ++
+ .../tests/blkdev_put_has_holder.c             | 17 +++++++++
+ drbd/drbd_nl.c                                | 28 ++++++++------
+ 4 files changed, 75 insertions(+), 11 deletions(-)
+ create mode 100644 drbd/drbd-kernel-compat/cocci/blkdev_put__no_has_holder.cocci
+ create mode 100644 drbd/drbd-kernel-compat/tests/blkdev_put_has_holder.c
+
+diff --git a/drbd/drbd-kernel-compat/cocci/blkdev_put__no_has_holder.cocci b/drbd/drbd-kernel-compat/cocci/blkdev_put__no_has_holder.cocci
+new file mode 100644
+index 000000000000..c903bc2d529c
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/cocci/blkdev_put__no_has_holder.cocci
+@@ -0,0 +1,38 @@
++@@
++expression path, mode;
++@@
++  blkdev_get_by_path(
++  	path,
++- 	mode,
+++ 	mode | FMODE_EXCL,
++  	...
++  )
++
++@@
++expression bdev, holder;
++@@
++  blkdev_put(
++  	bdev,
++- 	holder
+++ 	FMODE_READ | FMODE_WRITE | FMODE_EXCL
++  )
++
++@@
++identifier device, bdev, holder, do_bd_unlink;
++@@
++  void close_backing_dev(
++  	struct drbd_device *device,
++  	struct block_device *bdev,
++-  	void *holder,
++  	bool do_bd_unlink
++  ) { ... }
++
++@@
++expression device, bdev, holder, do_bd_unlink;
++@@
++  close_backing_dev(
++  	device,
++  	bdev,
++- 	holder,
++  	do_bd_unlink
++  )
+diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
+index 6e4f06d9a3a7..4761c1ef7d0c 100644
+--- a/drbd/drbd-kernel-compat/gen_patch_names.c
++++ b/drbd/drbd-kernel-compat/gen_patch_names.c
+@@ -562,6 +562,9 @@ int main(int argc, char **argv)
+ 	patch(1, "block_device_operations_open", true, false,
+ 	      COMPAT_BLOCK_DEVICE_OPERATIONS_OPEN_TAKES_GENDISK, "takes_gendisk");
+ 
++	patch(1, "blkdev_put", true, false,
++	      COMPAT_BLKDEV_PUT_HAS_HOLDER, "has_holder");
++
+ /* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
+ /* #define BLKDEV_ZERO_NOUNMAP */
+ 
+diff --git a/drbd/drbd-kernel-compat/tests/blkdev_put_has_holder.c b/drbd/drbd-kernel-compat/tests/blkdev_put_has_holder.c
+new file mode 100644
+index 000000000000..d5f0c5dd0355
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/tests/blkdev_put_has_holder.c
+@@ -0,0 +1,17 @@
++/* { "version": "v6.5-rc1", "commit": "ae220766d87cd6799dbf918fea10613ae14c0654", "comment": "block: remove the unused mode argument to ->release", "author": "Christoph Hellwig <hch@lst.de>", "date": "Thu Jun 8 13:02:37 2023 +0200" } */
++#include <linux/blkdev.h>
++
++#ifndef __same_type
++# define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
++#endif
++
++void foo_blkdev_put(struct block_device *bdev, void *holder)
++{
++}
++
++
++void foo(void)
++{
++	BUILD_BUG_ON(!(__same_type(&blkdev_put, &foo_blkdev_put)));
++}
++
+diff --git a/drbd/drbd_nl.c b/drbd/drbd_nl.c
+index b7e9e43312f9..8c968cf252ca 100644
+--- a/drbd/drbd_nl.c
++++ b/drbd/drbd_nl.c
+@@ -2536,13 +2536,13 @@ bool want_bitmap(struct drbd_peer_device *peer_device)
+ }
+ 
+ static void close_backing_dev(struct drbd_device *device, struct block_device *bdev,
+-	bool do_bd_unlink)
++	void *holder, bool do_bd_unlink)
+ {
+ 	if (!bdev)
+ 		return;
+ 	if (do_bd_unlink)
+ 		bd_unlink_disk_holder(bdev, device->vdisk);
+-	blkdev_put(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL);
++	blkdev_put(bdev, holder);
+ }
+ 
+ void drbd_backing_dev_free(struct drbd_device *device, struct drbd_backing_dev *ldev)
+@@ -2552,8 +2552,11 @@ void drbd_backing_dev_free(struct drbd_device *device, struct drbd_backing_dev *
+ 
+ 	drbd_dax_close(ldev);
+ 
+-	close_backing_dev(device, ldev->md_bdev, ldev->md_bdev != ldev->backing_bdev);
+-	close_backing_dev(device, ldev->backing_bdev, true);
++	close_backing_dev(device,
++			  ldev->md_bdev,
++			  ldev->md.meta_dev_idx < 0 ? (void *)device : (void *)drbd_m_holder,
++			  ldev->md_bdev != ldev->backing_bdev);
++	close_backing_dev(device, ldev->backing_bdev, device, true);
+ 
+ 	kfree(ldev->disk_conf);
+ 	kfree(ldev);
+@@ -2563,7 +2566,7 @@ static struct block_device *open_backing_dev(struct drbd_device *device,
+ 		const char *bdev_path, void *claim_ptr)
+ {
+ 	struct block_device *bdev = blkdev_get_by_path(bdev_path,
+-				  FMODE_READ | FMODE_WRITE | FMODE_EXCL,
++				  FMODE_READ | FMODE_WRITE,
+ 				  claim_ptr, NULL);
+ 	if (IS_ERR(bdev)) {
+ 		drbd_err(device, "open(\"%s\") failed with %ld\n",
+@@ -2588,6 +2591,7 @@ static int open_backing_devices(struct drbd_device *device,
+ 		struct drbd_backing_dev *nbc)
+ {
+ 	struct block_device *bdev;
++	void *meta_claim_ptr;
+ 	int err;
+ 
+ 	bdev = open_backing_dev(device, new_disk_conf->backing_dev, device);
+@@ -2597,12 +2601,17 @@ static int open_backing_devices(struct drbd_device *device,
+ 	err = link_backing_dev(device, new_disk_conf->backing_dev, bdev);
+ 	if (err) {
+ 		/* close without unlinking; otherwise error path will try to unlink */
+-		close_backing_dev(device, bdev, false);
++		close_backing_dev(device, bdev, device, false);
+ 		return ERR_OPEN_DISK;
+ 	}
+ 
+ 	nbc->backing_bdev = bdev;
+ 
++	/* meta_claim_ptr: device, if claimed exclusively; shared drbd_m_holder,
++	 * if potentially shared with other drbd minors
++	 */
++	meta_claim_ptr = (new_disk_conf->meta_dev_idx < 0) ?
++		(void *)device : (void *)drbd_m_holder;
+ 	/*
+ 	 * meta_dev_idx >= 0: external fixed size, possibly multiple
+ 	 * drbd sharing one meta device.  TODO in that case, paranoia
+@@ -2611,10 +2620,7 @@ static int open_backing_devices(struct drbd_device *device,
+ 	 * should check it for you already; but if you don't, or
+ 	 * someone fooled it, we need to double check here)
+ 	 */
+-	bdev = open_backing_dev(device, new_disk_conf->meta_dev,
+-		/* claim ptr: device, if claimed exclusively; shared drbd_m_holder,
+-		 * if potentially shared with other drbd minors */
+-			(new_disk_conf->meta_dev_idx < 0) ? (void*)device : (void*)drbd_m_holder);
++	bdev = open_backing_dev(device, new_disk_conf->meta_dev, meta_claim_ptr);
+ 	if (IS_ERR(bdev))
+ 		return ERR_OPEN_MD_DISK;
+ 
+@@ -2624,7 +2630,7 @@ static int open_backing_devices(struct drbd_device *device,
+ 		err = link_backing_dev(device, new_disk_conf->meta_dev, bdev);
+ 		if (err) {
+ 			/* close without unlinking; otherwise error path will try to unlink */
+-			close_backing_dev(device, bdev, false);
++			close_backing_dev(device, bdev, meta_claim_ptr, false);
+ 			return ERR_OPEN_MD_DISK;
+ 		}
+ 	}
+-- 
+2.35.3
+

0018-drbd-rework-autopromote.patch

@@ -0,0 +1,185 @@
+From e3ef0e229a6ae88346164d1507697ae1b397cdf9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20=22WanzenBug=22=20Wanzenb=C3=B6ck?=
+ <moritz.wanzenboeck@linbit.com>
+Date: Tue, 12 Sep 2023 10:17:08 +0200
+Subject: [PATCH 18/20] drbd: rework autopromote
+
+With upstream commit ae220766d87c we lost the ability to keep separate
+counts for RW and RO openers. Instead, we keep track of openers using a
+single count, and a flag indicating if the device was opened RW once.
+
+Once a device was opened RW, it will stay "writable" for DRBD, until all
+openers are gone. This should offer a good compromise between keeping
+the old auto-promote behaviour, and the changed device interface.
+---
+ drbd/drbd_int.h   |  3 ++-
+ drbd/drbd_main.c  | 38 +++++++++++++++++++++-----------------
+ drbd/drbd_nl.c    |  9 +++++----
+ drbd/drbd_state.c |  7 ++++---
+ 4 files changed, 32 insertions(+), 25 deletions(-)
+
+diff --git a/drbd/drbd_int.h b/drbd/drbd_int.h
+index b705f26e71a4..cf593c09cda1 100644
+--- a/drbd/drbd_int.h
++++ b/drbd/drbd_int.h
+@@ -1399,7 +1399,8 @@ struct drbd_device {
+ 
+ 	struct drbd_bitmap *bitmap;
+ 
+-	int open_rw_cnt, open_ro_cnt;
++	int open_cnt;
++	bool writable;
+ 	/* FIXME clean comments, restructure so it is more obvious which
+ 	 * members are protected by what */
+ 
+diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
+index 4b0b967c2c97..bb05b2215dfb 100644
+--- a/drbd/drbd_main.c
++++ b/drbd/drbd_main.c
+@@ -2579,10 +2579,9 @@ static enum ioc_rv inc_open_count(struct drbd_device *device, fmode_t mode)
+ 		r = IOC_ABORT;
+ 	else if (!resource->remote_state_change) {
+ 		r = IOC_OK;
++		device->open_cnt++;
+ 		if (mode & FMODE_WRITE)
+-			device->open_rw_cnt++;
+-		else
+-			device->open_ro_cnt++;
++			device->writable = true;
+ 	}
+ 	read_unlock_irq(&resource->state_rwlock);
+ 
+@@ -2756,8 +2755,10 @@ void drbd_open_counts(struct drbd_resource *resource, int *rw_count_ptr, int *ro
+ 
+ 	rcu_read_lock();
+ 	idr_for_each_entry(&resource->devices, device, vnr) {
+-		rw_count += device->open_rw_cnt;
+-		ro_count += device->open_ro_cnt;
++		if (device->writable)
++			rw_count += device->open_cnt;
++		else
++			ro_count += device->open_cnt;
+ 	}
+ 	rcu_read_unlock();
+ 	*rw_count_ptr = rw_count;
+@@ -2825,33 +2826,35 @@ static void drbd_release(struct gendisk *gd, fmode_t mode)
+ {
+ 	struct drbd_device *device = gd->private_data;
+ 	struct drbd_resource *resource = device->resource;
++	bool was_writable = device->writable;
+ 	int open_rw_cnt, open_ro_cnt;
+ 
+ 	mutex_lock(&resource->open_release);
+-	if (mode & FMODE_WRITE)
+-		device->open_rw_cnt--;
+-	else
+-		device->open_ro_cnt--;
++	device->open_cnt--;
+ 
+ 	drbd_open_counts(resource, &open_rw_cnt, &open_ro_cnt);
+ 
+-	/* last one to close will be responsible for write-out of all dirty pages */
+-	if (mode & FMODE_WRITE && device->open_rw_cnt == 0)
++	/* last one to close will be responsible for write-out of all dirty pages.
++	 * We also reset the writable flag for this device here:  later code may
++	 * check if the device is still opened for writes to determine things
++	 * like auto-demote.
++	 */
++	if (was_writable && device->open_cnt == 0) {
+ 		drbd_fsync_device(device);
++		device->writable = false;
++	}
+ 
+ 	if (open_ro_cnt == 0)
+ 		wake_up_all(&resource->state_wait);
+ 
+-	if (test_bit(UNREGISTERED, &device->flags) &&
+-	    device->open_rw_cnt == 0 && device->open_ro_cnt == 0 &&
++	if (test_bit(UNREGISTERED, &device->flags) && device->open_cnt == 0 &&
+ 	    !test_and_set_bit(DESTROYING_DEV, &device->flags))
+ 		call_rcu(&device->rcu, drbd_reclaim_device);
+ 
+ 	if (resource->res_opts.auto_promote) {
+ 		enum drbd_state_rv rv;
+ 
+-		if (mode & FMODE_WRITE &&
+-		    open_rw_cnt == 0 &&
++		if (was_writable && open_rw_cnt == 0 &&
+ 		    resource->role[NOW] == R_PRIMARY &&
+ 		    !test_bit(EXPLICIT_PRIMARY, &resource->flags)) {
+ 			rv = drbd_set_role(resource, R_SECONDARY, false, "auto-demote", NULL);
+@@ -2869,9 +2872,10 @@ static void drbd_release(struct gendisk *gd, fmode_t mode)
+ 		end_state_change(resource, &irq_flags, "release");
+ 	}
+ 
+-	/* if the open counts are 0, we free the whole list, otherwise we remove the specific pid */
++	/* if the open count is 0, we free the whole list, otherwise we remove the specific pid */
+ 	prune_or_free_openers(device,
+-			(open_ro_cnt == 0 && open_rw_cnt == 0) ? 0 : task_pid_nr(current));
++			      (open_ro_cnt == 0 && open_rw_cnt == 0) ?
++			      0 : task_pid_nr(current));
+ 
+ 	mutex_unlock(&resource->open_release);
+ 
+diff --git a/drbd/drbd_nl.c b/drbd/drbd_nl.c
+index b0a1e6fa46f1..71ed4272614e 100644
+--- a/drbd/drbd_nl.c
++++ b/drbd/drbd_nl.c
+@@ -4541,8 +4541,10 @@ int drbd_open_ro_count(struct drbd_resource *resource)
+ 	int vnr, open_ro_cnt = 0;
+ 
+ 	read_lock_irq(&resource->state_rwlock);
+-	idr_for_each_entry(&resource->devices, device, vnr)
+-		open_ro_cnt += device->open_ro_cnt;
++	idr_for_each_entry(&resource->devices, device, vnr) {
++		if (!device->writable)
++			open_ro_cnt += device->open_cnt;
++	}
+ 	read_unlock_irq(&resource->state_rwlock);
+ 
+ 	return open_ro_cnt;
+@@ -6394,8 +6396,7 @@ static enum drbd_ret_code adm_del_minor(struct drbd_device *device)
+ 	notify_device_state(NULL, 0, device, NULL, NOTIFY_DESTROY);
+ 	mutex_unlock(&notification_mutex);
+ 
+-	if (device->open_ro_cnt == 0 && device->open_rw_cnt == 0 &&
+-	    !test_and_set_bit(DESTROYING_DEV, &device->flags))
++	if (device->open_cnt == 0 && !test_and_set_bit(DESTROYING_DEV, &device->flags))
+ 		call_rcu(&device->rcu, drbd_reclaim_device);
+ 
+ 	return ret;
+diff --git a/drbd/drbd_state.c b/drbd/drbd_state.c
+index 22cd134be962..fa70507df425 100644
+--- a/drbd/drbd_state.c
++++ b/drbd/drbd_state.c
+@@ -1634,7 +1634,7 @@ handshake_found:
+ 				return SS_TWO_PRIMARIES;
+ 			if (!fail_io[NEW]) {
+ 				idr_for_each_entry(&resource->devices, device, vnr) {
+-					if (device->open_ro_cnt)
++					if (!device->writable && device->open_cnt)
+ 						return SS_PRIMARY_READER;
+ 					/*
+ 					 * One might be tempted to add "|| open_rw_cont" here.
+@@ -1661,7 +1661,7 @@ handshake_found:
+ 		     (disk_state[OLD] > D_DETACHING && disk_state[NEW] == D_DETACHING)))
+ 			return SS_IN_TRANSIENT_STATE;
+ 
+-		if (role[OLD] == R_PRIMARY && role[NEW] == R_SECONDARY && device->open_rw_cnt &&
++		if (role[OLD] == R_PRIMARY && role[NEW] == R_SECONDARY && device->writable &&
+ 		    !(resource->state_change_flags & CS_FS_IGN_OPENERS))
+ 			return SS_DEVICE_IN_USE;
+ 
+@@ -1693,7 +1693,8 @@ handshake_found:
+ 			return SS_NO_UP_TO_DATE_DISK;
+ 
+ 		/* Prevent detach or disconnect while held open read only */
+-		if (device->open_ro_cnt && any_disk_up_to_date[OLD] && !any_disk_up_to_date[NEW])
++		if (!device->writable && device->open_cnt &&
++		    any_disk_up_to_date[OLD] && !any_disk_up_to_date[NEW])
+ 			return SS_NO_UP_TO_DATE_DISK;
+ 
+ 		if (disk_state[NEW] == D_NEGOTIATING)
+-- 
+2.35.3
+

0019-compat-block-remove-the-unused-mode-argument-to-rele.patch

@@ -0,0 +1,107 @@
+From bf287c15359c4495a706ca270e7dcab4c2d6ebcc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20=22WanzenBug=22=20Wanzenb=C3=B6ck?=
+ <moritz.wanzenboeck@linbit.com>
+Date: Tue, 12 Sep 2023 15:27:01 +0200
+Subject: [PATCH 19/20] compat: block: remove the unused mode argument to
+ ->release
+
+See also upstream Linux kernel commit
+ae220766d87c ("block: remove the unused mode argument to ->release")
+
+Original message:
+
+The mode argument to the ->release block_device_operation is never used,
+so remove it.
+---
+ ...ions_release__no_takes_single_argument.cocci | 17 +++++++++++++++++
+ drbd/drbd-kernel-compat/gen_patch_names.c       |  3 +++
+ ...e_operations_release_takes_single_argument.c |  7 +++++++
+ drbd/drbd_main.c                                |  6 +++---
+ 4 files changed, 30 insertions(+), 3 deletions(-)
+ create mode 100644 drbd/drbd-kernel-compat/cocci/block_device_operations_release__no_takes_single_argument.cocci
+ create mode 100644 drbd/drbd-kernel-compat/tests/block_device_operations_release_takes_single_argument.c
+
+diff --git a/drbd/drbd-kernel-compat/cocci/block_device_operations_release__no_takes_single_argument.cocci b/drbd/drbd-kernel-compat/cocci/block_device_operations_release__no_takes_single_argument.cocci
+new file mode 100644
+index 000000000000..b0a0ee9eef39
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/cocci/block_device_operations_release__no_takes_single_argument.cocci
+@@ -0,0 +1,17 @@
++@@
++identifier gd;
++fresh identifier mode = "" ## "mode";
++@@
++  drbd_release(
++  	struct gendisk *gd
+++ 	, fmode_t mode
++  ) { ... }
++
++@@
++symbol drbd_release;
++expression gd;
++@@
++  drbd_release(
++  	gd
+++ 	, 0
++  )
+diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
+index 4761c1ef7d0c..608be8b4f099 100644
+--- a/drbd/drbd-kernel-compat/gen_patch_names.c
++++ b/drbd/drbd-kernel-compat/gen_patch_names.c
+@@ -565,6 +565,9 @@ int main(int argc, char **argv)
+ 	patch(1, "blkdev_put", true, false,
+ 	      COMPAT_BLKDEV_PUT_HAS_HOLDER, "has_holder");
+ 
++	patch(1, "block_device_operations_release", true, false,
++	      COMPAT_BLOCK_DEVICE_OPERATIONS_RELEASE_TAKES_SINGLE_ARGUMENT, "takes_single_argument");
++
+ /* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
+ /* #define BLKDEV_ZERO_NOUNMAP */
+ 
+diff --git a/drbd/drbd-kernel-compat/tests/block_device_operations_release_takes_single_argument.c b/drbd/drbd-kernel-compat/tests/block_device_operations_release_takes_single_argument.c
+new file mode 100644
+index 000000000000..d51c863e359a
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/tests/block_device_operations_release_takes_single_argument.c
+@@ -0,0 +1,7 @@
++/* { "version": "v6.5-rc1", "commit": "ae220766d87cd6799dbf918fea10613ae14c0654", "comment": "block: remove the unused mode argument to ->release", "author": "Christoph Hellwig <hch@lst.de>", "date": "Thu Jun 8 13:02:37 2023 +0200" } */
++#include <linux/blkdev.h>
++
++void foo(struct block_device_operations *ops, struct gendisk *gd)
++{
++	ops->release(gd);
++}
+diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
+index bb05b2215dfb..1864861db21d 100644
+--- a/drbd/drbd_main.c
++++ b/drbd/drbd_main.c
+@@ -53,7 +53,7 @@
+ #include "drbd_dax_pmem.h"
+ 
+ static int drbd_open(struct gendisk *gd, fmode_t mode);
+-static void drbd_release(struct gendisk *gd, fmode_t mode);
++static void drbd_release(struct gendisk *gd);
+ static void md_sync_timer_fn(struct timer_list *t);
+ static int w_bitmap_io(struct drbd_work *w, int unused);
+ static int flush_send_buffer(struct drbd_connection *connection, enum drbd_stream drbd_stream);
+@@ -2740,7 +2740,7 @@ out:
+ 
+ 	mutex_unlock(&resource->open_release);
+ 	if (err) {
+-		drbd_release(gd, mode);
++		drbd_release(gd);
+ 		if (err == -EAGAIN && !(mode & FMODE_NDELAY))
+ 			err = -EMEDIUMTYPE;
+ 	}
+@@ -2822,7 +2822,7 @@ void drbd_fsync_device(struct drbd_device *device)
+ 	drbd_flush_peer_acks(resource);
+ }
+ 
+-static void drbd_release(struct gendisk *gd, fmode_t mode)
++static void drbd_release(struct gendisk *gd)
+ {
+ 	struct drbd_device *device = gd->private_data;
+ 	struct drbd_resource *resource = device->resource;
+-- 
+2.35.3
+

0022-compat-block-replace-fmode_t-with-a-block-specific-t.patch

@@ -0,0 +1,183 @@
+From 2d3c3fd6546174a0452c9bbd64d4f4193c0c39e2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20WanzenBug=20Wanzenb=C3=B6ck?=
+ <moritz.wanzenboeck@linbit.com>
+Date: Wed, 13 Sep 2023 11:26:35 +0200
+Subject: [PATCH] compat: block: replace fmode_t with a block-specific type for
+ block open flags
+
+See also upstream Linux kernel commit
+05bdb9965305 ("block: replace fmode_t with a block-specific type for block open flags"
+
+Original message:
+
+The only overlap between the block open flags mapped into the fmode_t and
+other uses of fmode_t are FMODE_READ and FMODE_WRITE.  Define a new
+blk_mode_t instead for use in blkdev_get_by_{dev,path}, ->open and
+->ioctl and stop abusing fmode_t.
+---
+ .../cocci/blk_mode_t__no_present.cocci        | 19 ++++++++++++++
+ drbd/drbd-kernel-compat/gen_patch_names.c     |  3 +++
+ .../tests/have_blk_mode_t.c                   |  4 +++
+ drbd/drbd_main.c                              | 26 +++++++++----------
+ 4 files changed, 39 insertions(+), 13 deletions(-)
+ create mode 100644 drbd/drbd-kernel-compat/cocci/blk_mode_t__no_present.cocci
+ create mode 100644 drbd/drbd-kernel-compat/tests/have_blk_mode_t.c
+
+diff --git a/drbd/drbd-kernel-compat/cocci/blk_mode_t__no_present.cocci b/drbd/drbd-kernel-compat/cocci/blk_mode_t__no_present.cocci
+new file mode 100644
+index 000000000000..030723c817de
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/cocci/blk_mode_t__no_present.cocci
+@@ -0,0 +1,19 @@
++@@
++identifier fn;
++identifier mode;
++@@
++  fn (
++  	...,
++- 	blk_mode_t mode
+++ 	fmode_t mode
++  ) {
++  <...
++(
++- BLK_OPEN_WRITE
+++ FMODE_WRITE
++|
++- BLK_OPEN_NDELAY
+++ FMODE_NDELAY
++)
++  ...>
++  }
+diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
+index 6a96c5b89f11..e4a65a3c451e 100644
+--- a/drbd/drbd-kernel-compat/gen_patch_names.c
++++ b/drbd/drbd-kernel-compat/gen_patch_names.c
+@@ -571,6 +571,9 @@ int main(int argc, char **argv)
+ 	patch(1, "block_device_operations_release", true, false,
+ 	      COMPAT_BLOCK_DEVICE_OPERATIONS_RELEASE_TAKES_SINGLE_ARGUMENT, "takes_single_argument");
+ 
++	patch(1, "blk_mode_t", true, false,
++	      COMPAT_HAVE_BLK_MODE_T, "present");
++
+ /* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
+ /* #define BLKDEV_ZERO_NOUNMAP */
+ 
+diff --git a/drbd/drbd-kernel-compat/tests/have_blk_mode_t.c b/drbd/drbd-kernel-compat/tests/have_blk_mode_t.c
+new file mode 100644
+index 000000000000..e063bdc30f43
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/tests/have_blk_mode_t.c
+@@ -0,0 +1,4 @@
++/* { "version": "v6.5-rc1", "commit": "05bdb9965305bbfdae79b31d22df03d1e2cfcb22", "comment": "block: replace fmode_t with a block-specific type for block open flags", "author": "Christoph Hellwig <hch@lst.de>", "date": "Thu Jun 8 13:02:55 2023 +0200" } */
++#include <linux/blkdev.h>
++
++void foo(blk_mode_t mode) {}
+diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
+index 0719229f210e..f9560bdff63f 100644
+--- a/drbd/drbd_main.c
++++ b/drbd/drbd_main.c
+@@ -52,7 +52,7 @@
+ #include "drbd_meta_data.h"
+ #include "drbd_dax_pmem.h"
+ 
+-static int drbd_open(struct gendisk *gd, fmode_t mode);
++static int drbd_open(struct gendisk *gd, blk_mode_t mode);
+ static void drbd_release(struct gendisk *gd);
+ static void md_sync_timer_fn(struct timer_list *t);
+ static int w_bitmap_io(struct drbd_work *w, int unused);
+@@ -2566,10 +2566,10 @@ enum ioc_rv {
+ 	IOC_ABORT = 2,
+ };
+ 
+-static enum ioc_rv inc_open_count(struct drbd_device *device, fmode_t mode)
++static enum ioc_rv inc_open_count(struct drbd_device *device, blk_mode_t mode)
+ {
+ 	struct drbd_resource *resource = device->resource;
+-	enum ioc_rv r = mode & FMODE_NDELAY ? IOC_ABORT : IOC_SLEEP;
++	enum ioc_rv r = mode & BLK_OPEN_NDELAY ? IOC_ABORT : IOC_SLEEP;
+ 
+ 	if (test_bit(DOWN_IN_PROGRESS, &resource->flags))
+ 		return IOC_ABORT;
+@@ -2580,7 +2580,7 @@ static enum ioc_rv inc_open_count(struct drbd_device *device, fmode_t mode)
+ 	else if (!resource->remote_state_change) {
+ 		r = IOC_OK;
+ 		device->open_cnt++;
+-		if (mode & FMODE_WRITE)
++		if (mode & BLK_OPEN_WRITE)
+ 			device->writable = true;
+ 	}
+ 	read_unlock_irq(&resource->state_rwlock);
+@@ -2646,7 +2646,7 @@ out:
+ 	spin_unlock(&device->openers_lock);
+ }
+ 
+-static int drbd_open(struct gendisk *gd, fmode_t mode)
++static int drbd_open(struct gendisk *gd, blk_mode_t mode)
+ {
+ 	struct drbd_device *device = gd->private_data;
+ 	struct drbd_resource *resource = device->resource;
+@@ -2655,7 +2655,7 @@ static int drbd_open(struct gendisk *gd, fmode_t mode)
+ 	int err = 0;
+ 
+ 	/* Fail read-only open from systemd-udev (version <= 238) */
+-	if (!(mode & FMODE_WRITE) && !drbd_allow_oos) {
++	if (!(mode & BLK_OPEN_WRITE) && !drbd_allow_oos) {
+ 		char comm[TASK_COMM_LEN];
+ 		get_task_comm(comm, current);
+ 		if (!strcmp("systemd-udevd", comm))
+@@ -2664,7 +2664,7 @@ static int drbd_open(struct gendisk *gd, fmode_t mode)
+ 
+ 	/* Fail read-write open early,
+ 	 * in case someone explicitly set us read-only (blockdev --setro) */
+-	if (bdev_read_only(gd->part0) && (mode & FMODE_WRITE))
++	if (bdev_read_only(gd->part0) && (mode & BLK_OPEN_WRITE))
+ 		return -EACCES;
+ 
+ 	if (resource->fail_io[NOW])
+@@ -2693,14 +2693,14 @@ static int drbd_open(struct gendisk *gd, fmode_t mode)
+ 		   This avoids split brain when the drbd volume gets opened
+ 		   temporarily by udev while it scans for PV signatures. */
+ 
+-		if (mode & FMODE_WRITE) {
++		if (mode & BLK_OPEN_WRITE) {
+ 			if (resource->role[NOW] == R_SECONDARY) {
+-				rv = try_to_promote(device, timeout, (mode & FMODE_NDELAY));
++				rv = try_to_promote(device, timeout, (mode & BLK_OPEN_NDELAY));
+ 				if (rv < SS_SUCCESS)
+ 					drbd_info(resource, "Auto-promote failed: %s (%d)\n",
+ 						  drbd_set_st_err_str(rv), rv);
+ 			}
+-		} else if ((mode & FMODE_NDELAY) == 0) {
++		} else if ((mode & BLK_OPEN_NDELAY) == 0) {
+ 			/* Double check peers
+ 			 *
+ 			 * Some services may try to first open ro, and only if that
+@@ -2720,14 +2720,14 @@ static int drbd_open(struct gendisk *gd, fmode_t mode)
+ 			}
+ 		}
+ 	} else if (resource->role[NOW] != R_PRIMARY &&
+-			!(mode & FMODE_WRITE) && !drbd_allow_oos) {
++			!(mode & BLK_OPEN_WRITE) && !drbd_allow_oos) {
+ 		err = -EMEDIUMTYPE;
+ 		goto out;
+ 	}
+ 
+ 	if (test_bit(UNREGISTERED, &device->flags)) {
+ 		err = -ENODEV;
+-	} else if (mode & FMODE_WRITE) {
++	} else if (mode & BLK_OPEN_WRITE) {
+ 		if (resource->role[NOW] != R_PRIMARY)
+ 			err = -EROFS;
+ 	} else /* READ access only */ {
+@@ -2741,7 +2741,7 @@ out:
+ 	mutex_unlock(&resource->open_release);
+ 	if (err) {
+ 		drbd_release(gd);
+-		if (err == -EAGAIN && !(mode & FMODE_NDELAY))
++		if (err == -EAGAIN && !(mode & BLK_OPEN_NDELAY))
+ 			err = -EMEDIUMTYPE;
+ 	}
+ 
+-- 
+2.42.1
+

0023-compat-genetlink-remove-userhdr-from-struct-genl_inf.patch

@@ -0,0 +1,96 @@
+From 1412792a443ddc696fd1c8981a6cc544272f54bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20WanzenBug=20Wanzenb=C3=B6ck?=
+ <moritz.wanzenboeck@linbit.com>
+Date: Wed, 13 Sep 2023 15:46:12 +0200
+Subject: [PATCH] compat: genetlink: remove userhdr from struct genl_info
+
+See also upstream Linux kernel commit
+bffcc6882a1b ("genetlink: remove userhdr from struct genl_info")
+
+Original message:
+
+Only three families use info->userhdr today and going forward
+we discourage using fixed headers in new families.
+So having the pointer to user header in struct genl_info
+is an overkill. Compute the header pointer at runtime.
+---
+ .../cocci/genl_info_userhdr__no_present.cocci              | 5 +++++
+ drbd/drbd-kernel-compat/gen_patch_names.c                  | 3 +++
+ drbd/drbd-kernel-compat/tests/have_genl_info_userhdr.c     | 7 +++++++
+ drbd/drbd_nl.c                                             | 6 +++---
+ 4 files changed, 18 insertions(+), 3 deletions(-)
+ create mode 100644 drbd/drbd-kernel-compat/cocci/genl_info_userhdr__no_present.cocci
+ create mode 100644 drbd/drbd-kernel-compat/tests/have_genl_info_userhdr.c
+
+diff --git a/drbd/drbd-kernel-compat/cocci/genl_info_userhdr__no_present.cocci b/drbd/drbd-kernel-compat/cocci/genl_info_userhdr__no_present.cocci
+new file mode 100644
+index 000000000000..75e787797068
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/cocci/genl_info_userhdr__no_present.cocci
+@@ -0,0 +1,5 @@
++@@
++expression info;
++@@
++- genl_info_userhdr(info)
+++ info->userhdr
+diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
+index e4a65a3c451e..b136acf3148a 100644
+--- a/drbd/drbd-kernel-compat/gen_patch_names.c
++++ b/drbd/drbd-kernel-compat/gen_patch_names.c
+@@ -574,6 +574,9 @@ int main(int argc, char **argv)
+ 	patch(1, "blk_mode_t", true, false,
+ 	      COMPAT_HAVE_BLK_MODE_T, "present");
+ 
++	patch(1, "genl_info_userhdr", true, false,
++	      COMPAT_HAVE_GENL_INFO_USERHDR, "present");
++
+ /* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
+ /* #define BLKDEV_ZERO_NOUNMAP */
+ 
+diff --git a/drbd/drbd-kernel-compat/tests/have_genl_info_userhdr.c b/drbd/drbd-kernel-compat/tests/have_genl_info_userhdr.c
+new file mode 100644
+index 000000000000..3c69dacce244
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/tests/have_genl_info_userhdr.c
+@@ -0,0 +1,7 @@
++/* { "version": "v6.6-rc1", "commit": "bffcc6882a1bb2be8c9420184966f4c2c822078e", "comment": "genetlink: remove userhdr from struct genl_info", "author": "Jakub Kicinski <kuba@kernel.org>", "date": "Mon Aug 14 14:47:16 2023 -0700" } */
++#include <net/genetlink.h>
++
++void *foo(struct genl_info *info)
++{
++	return genl_info_userhdr(info);
++}
+diff --git a/drbd/drbd_nl.c b/drbd/drbd_nl.c
+index 71ed4272614e..538c31202e4b 100644
+--- a/drbd/drbd_nl.c
++++ b/drbd/drbd_nl.c
+@@ -203,7 +203,7 @@ static struct drbd_path *first_path(struct drbd_connection *connection)
+ static int drbd_adm_prepare(struct drbd_config_context *adm_ctx,
+ 	struct sk_buff *skb, struct genl_info *info, unsigned flags)
+ {
+-	struct drbd_genlmsghdr *d_in = info->userhdr;
++	struct drbd_genlmsghdr *d_in = genl_info_userhdr(info);
+ 	const u8 cmd = info->genlhdr->cmd;
+ 	int err;
+ 
+@@ -2106,7 +2106,7 @@ static void drbd_try_suspend_al(struct drbd_device *device)
+ 
+ static bool should_set_defaults(struct genl_info *info)
+ {
+-	unsigned flags = ((struct drbd_genlmsghdr*)info->userhdr)->flags;
++	unsigned int flags = ((struct drbd_genlmsghdr *)genl_info_userhdr(info))->flags;
+ 	return 0 != (flags & DRBD_GENL_F_SET_DEFAULTS);
+ }
+ 
+@@ -6279,7 +6279,7 @@ out_no_unlock:
+ int drbd_adm_new_minor(struct sk_buff *skb, struct genl_info *info)
+ {
+ 	struct drbd_config_context adm_ctx;
+-	struct drbd_genlmsghdr *dh = info->userhdr;
++	struct drbd_genlmsghdr *dh = genl_info_userhdr(info);
+ 	struct device_conf device_conf;
+ 	struct drbd_resource *resource;
+ 	struct drbd_device *device;
+-- 
+2.42.1
+

Module.supported

@@ -0,0 +1,2 @@
+updates/drbd.ko
+updates/drbd_transport_tcp.ko

_service

@@ -0,0 +1,18 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">git@github.com:LINBIT/drbd-9.0.git</param>
+    <param name="scm">git</param>
+    <param name="filename">drbd</param>
+    <param name="versionformat">9.0.30~1+git.%h</param>
+    <param name="revision">drbd-9.0</param>
+  </service>
+
+  <service name="recompress" mode="disabled">
+    <param name="file">*drbd*.tar</param>
+    <param name="compression">bz2</param>
+  </service>
+
+  <service name="set_version" mode="disabled">
+    <param name="basename">drbd</param>
+  </service>
+</services>

bsc-1025089_fix-resync-finished-with-syncs-have-bits-set.patch

@@ -0,0 +1,13 @@
+diff -Naur drbd-9.0.7rc1+git.093821cd.orig/drbd/drbd_receiver.c drbd-9.0.7rc1+git.093821cd/drbd/drbd_receiver.c
+--- drbd-9.0.7rc1+git.093821cd.orig/drbd/drbd_receiver.c	2017-03-24 16:55:42.169376092 +0800
++++ drbd-9.0.7rc1+git.093821cd/drbd/drbd_receiver.c	2017-03-24 16:56:51.137239174 +0800
+@@ -6240,7 +6240,8 @@
+ 		/* if peer_state changes to connected at the same time,
+ 		 * it explicitly notifies us that it finished resync.
+ 		 * Maybe we should finish it up, too? */
+-		else if (peer_state.conn == L_ESTABLISHED) {
++		else if (peer_state.conn == L_ESTABLISHED &&
++		        peer_disk_state > D_NEGOTIATING) {
+ 			bool finish_now = false;
+ 
+ 			if (old_peer_state.conn == L_WF_BITMAP_S) {

bsc-1216666-compat-sock-Remove-sendpage-in-favour-of-sendmsg-MSG.patch

@@ -0,0 +1,107 @@
+From 6fd35546c2d2afd10afe04ab9cdf4ac9ca0b3e94 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20=22WanzenBug=22=20Wanzenb=C3=B6ck?=
+ <moritz.wanzenboeck@linbit.com>
+Date: Wed, 13 Sep 2023 13:30:57 +0200
+Subject: [PATCH] compat: sock: Remove ->sendpage*() in favour of
+ sendmsg(MSG_SPLICE_PAGES)
+
+See also upstream Linux kernel commits
+dc97391e6610 ("sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)")
+eeac7405c735 ("drbd: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage()")
+4b9c2edaf728 ("drbd: swap bvec_set_page len and offset")
+
+Original message:
+
+Remove ->sendpage() and ->sendpage_locked().  sendmsg() with
+MSG_SPLICE_PAGES should be used instead.  This allows multiple pages and
+multipage folios to be passed through.
+---
+ .../cocci/msg_splice_pages__no_present.cocci     | 16 ++++++++++++++++
+ drbd/drbd-kernel-compat/gen_patch_names.c        |  3 +++
+ .../tests/have_msg_splice_pages.c                |  7 +++++++
+ drbd/drbd_transport_tcp.c                        |  8 ++++++--
+ 4 files changed, 32 insertions(+), 2 deletions(-)
+ create mode 100644 drbd/drbd-kernel-compat/cocci/msg_splice_pages__no_present.cocci
+ create mode 100644 drbd/drbd-kernel-compat/tests/have_msg_splice_pages.c
+
+diff --git a/drbd/drbd-kernel-compat/cocci/msg_splice_pages__no_present.cocci b/drbd/drbd-kernel-compat/cocci/msg_splice_pages__no_present.cocci
+new file mode 100644
+index 000000000000..0fdf77e43737
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/cocci/msg_splice_pages__no_present.cocci
+@@ -0,0 +1,16 @@
++@@
++expression flags;
++@@
++  flags
++- | MSG_SPLICE_PAGES
++
++@@
++identifier bvec, page, len, offset, msg, socket;
++@@
++- struct bio_vec bvec;
++  ...
++  int sent;
++- bvec_set_page(&bvec, page, len, offset);
++- iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, len);
++- sent = sock_sendmsg(socket, &msg);
+++ sent = socket->ops->sendpage(socket, page, offset, len, msg.msg_flags);
+diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
+index 228386f448a5..e4a65a3c451e 100644
+--- a/drbd/drbd-kernel-compat/gen_patch_names.c
++++ b/drbd/drbd-kernel-compat/gen_patch_names.c
+@@ -127,6 +127,9 @@ int main(int argc, char **argv)
+ 	patch(1, "bvec_kmap_local", true, false,
+ 	      COMPAT_HAVE_BVEC_KMAP_LOCAL, "present");
+ 
++	patch(1, "msg_splice_pages", true, false,
++	      COMPAT_HAVE_MSG_SPLICE_PAGES, "present");
++
+ 	patch(1, "struct_bvec_iter", true, false,
+ 	      COMPAT_HAVE_STRUCT_BVEC_ITER, "present");
+ 
+diff --git a/drbd/drbd-kernel-compat/tests/have_msg_splice_pages.c b/drbd/drbd-kernel-compat/tests/have_msg_splice_pages.c
+new file mode 100644
+index 000000000000..0bb23ef6d39a
+--- /dev/null
++++ b/drbd/drbd-kernel-compat/tests/have_msg_splice_pages.c
+@@ -0,0 +1,7 @@
++/* { "version": "v6.5-rc1", "commit": "dc97391e661009eab46783030d2404c9b6e6f2e7", "comment": "sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)", "author": "David Howells <dhowells@redhat.com>", "date": "Fri Jun 23 23:55:12 2023 +0100" } */
++#include <linux/net.h>
++
++int foo(void)
++{
++	return MSG_SPLICE_PAGES;
++}
+diff --git a/drbd/drbd_transport_tcp.c b/drbd/drbd_transport_tcp.c
+index ca60833f73d7..5dcba50dd0eb 100644
+--- a/drbd/drbd_transport_tcp.c
++++ b/drbd/drbd_transport_tcp.c
+@@ -1193,18 +1193,22 @@ static int dtt_send_page(struct drbd_transport *transport, enum drbd_stream stre
+ 	struct drbd_tcp_transport *tcp_transport =
+ 		container_of(transport, struct drbd_tcp_transport, transport);
+ 	struct socket *socket = tcp_transport->stream[stream];
++	struct msghdr msg = { .msg_flags = msg_flags | MSG_NOSIGNAL | MSG_SPLICE_PAGES };
++	struct bio_vec bvec;
+ 	int len = size;
+ 	int err = -EIO;
+ 
+ 	if (!socket)
+ 		return -ENOTCONN;
+ 
+-	msg_flags |= MSG_NOSIGNAL;
+ 	dtt_update_congested(tcp_transport);
+ 	do {
+ 		int sent;
+ 
+-		sent = socket->ops->sendpage(socket, page, offset, len, msg_flags);
++		bvec_set_page(&bvec, page, len, offset);
++		iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, len);
++
++		sent = sock_sendmsg(socket, &msg);
+ 		if (sent <= 0) {
+ 			if (sent == -EAGAIN) {
+ 				if (drbd_stream_send_timed_out(transport, stream))
+-- 
+2.35.3
+

drbd.spec

@@ -0,0 +1,144 @@
+#
+# spec file for package drbd
+#
+# Copyright (c) 2021 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+# needssslcertforbuild
+
+
+# RT enabled in Leap15.2(but not in Tumbleweed)
+%if ! 0%{?is_opensuse} || 0%{?sle_version} >= 150200
+%ifarch x86_64
+%define buildrt 1
+%endif
+%endif
+
+Name:           drbd
+Version:        9.1.16
+Release:        0
+Summary:        Linux driver for the "Distributed Replicated Block Device"
+License:        GPL-2.0-or-later
+URL:            https://drbd.linbit.com/
+Source:         %{name}-%{version}.tar.gz
+Source1:        preamble
+Source2:        Module.supported
+Source3:        drbd_git_revision
+
+Patch1:   bsc-1025089_fix-resync-finished-with-syncs-have-bits-set.patch
+Patch2:   0006-drbd-log-numeric-value-of-drbd_state_rv-as-well-as-s.patch
+Patch3:   0008-compat-block-introduce-holder-ops.patch
+Patch4:   0011-compat-block-pass-a-gendisk-to-open.patch
+Patch5:   0013-drbd-remove-unused-extern-for-conn_try_outdate_peer.patch
+Patch6:   0014-drbd-include-source-of-state-change-in-log.patch
+Patch7:   0015-compat-block-use-the-holder-as-indication-for-exclus.patch
+Patch8:   0018-drbd-rework-autopromote.patch
+Patch9:   0019-compat-block-remove-the-unused-mode-argument-to-rele.patch
+Patch10:  0022-compat-block-replace-fmode_t-with-a-block-specific-t.patch
+Patch11:  0023-compat-genetlink-remove-userhdr-from-struct-genl_inf.patch
+Patch12:  bsc-1216666-compat-sock-Remove-sendpage-in-favour-of-sendmsg-MSG.patch
+Patch99:  suse-coccinelle.patch
+
+#https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py
+BuildRequires:  coccinelle >= 1.0.8
+BuildRequires:  kernel-source
+BuildRequires:  kernel-syms
+BuildRequires:  libelf-devel
+BuildRequires:  modutils
+BuildRequires:  %kernel_module_package_buildreqs
+Requires:       drbd-utils >= 9.3.0
+Supplements:    drbd-utils >= 9.3.0
+Obsoletes:      drbd-kmp < %{version}
+ExcludeArch:    i586 s390
+%kernel_module_package -n drbd -p %{_sourcedir}/preamble
+%if 0%{?buildrt} == 1
+BuildRequires:  kernel-source-rt
+BuildRequires:  kernel-syms-rt
+%endif
+
+%description
+DRBD is a distributed replicated block device. It mirrors a block
+device over the network to another machine. Think of it as networked
+raid 1. It is a building block for setting up clusters.
+
+%package KMP
+Summary:        Kernel driver
+URL:            http://drbd.linbit.com/
+
+%description KMP
+This module is the kernel-dependent driver for DRBD. This is split out so
+that multiple kernel driver versions can be installed, one for each
+installed kernel.
+
+%prep
+%setup -q -n drbd-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch99 -p1
+
+mkdir source
+cp -a drbd/. source/. || :
+cp $RPM_SOURCE_DIR/drbd_git_revision source/.drbd_git_revision
+
+%build
+rm -rf obj
+mkdir obj
+ln -s ../scripts obj/
+
+export WANT_DRBD_REPRODUCIBLE_BUILD=1
+export CONFIG_BLK_DEV_DRBD=m
+export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
+# Unset SPAAS or set as 'true' will use `spatch-as-a-service` from drbd.io
+# when "coccinelle" not installed. Set SPAAS to 'false' to force an ERROR.
+export SPAAS='false'
+
+for flavor in %{flavors_to_build}; do
+    rm -rf $flavor
+    cp -a -r source $flavor
+    cp -a %{_sourcedir}/Module.supported $flavor
+    export DRBDSRC="$PWD/obj/$flavor"
+    # bsc#1160194, check the coccicheck work.
+    #make coccicheck
+    make %{?_smp_mflags} -C %{kernel_source $flavor} modules M=$PWD/$flavor SPAAS=${SPAAS}
+
+    # Check the compat result
+    cat $PWD/$flavor/compat.h
+done
+
+%install
+export INSTALL_MOD_PATH=%{buildroot}
+export INSTALL_MOD_DIR=updates
+for flavor in %{flavors_to_build}; do
+    make -C %{kernel_source $flavor} modules_install M=$PWD/$flavor
+done
+
+mkdir -p %{buildroot}/%{_sbindir}
+ln -s -f %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
+rm -f drbd.conf
+
+%files
+%license COPYING
+%doc ChangeLog
+%{_sbindir}/rc%{name}
+
+%changelog

drbd_git_revision

@@ -0,0 +1 @@
+GIT-hash: 288abda1fb8c93e385960af01ab28729fefdaa38

preamble

@@ -0,0 +1,3 @@
+Requires: kernel-%1
+Supplements: packageand(kernel-%1:%name)
+Recommends: drbd

suse-coccinelle.patch

@@ -0,0 +1,76 @@
+diff -Naur drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/gen_compat_patch.sh drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/gen_compat_patch.sh
+--- drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/gen_compat_patch.sh	2021-05-07 11:24:44.877547149 +0800
++++ drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/gen_compat_patch.sh	2021-05-07 12:30:58.385703306 +0800
+@@ -44,9 +44,19 @@
+ 
+ if hash spatch && spatch_is_recent; then
+     K=$(cat $incdir/kernelrelease.txt)
++
++    echo "  compat.h content ";
++    cat $incdir/compat.h;
++    echo "  -------------------   ";
++
+     echo "  GENPATCHNAMES   "$K
+     gcc -I $incdir -o $incdir/gen_patch_names -std=c99 drbd-kernel-compat/gen_patch_names.c
+     $incdir/gen_patch_names > $incdir/applied_cocci_files.txt
++
++    echo "  APPLIED_COCCI_FILES   ";
++    cat $incdir/applied_cocci_files.txt;
++    echo "  -------------------   ";
++
+     rm $incdir/gen_patch_names
+     rm -f $incdir/.compat.cocci
+     rm -f $incdir/.compat.patch
+@@ -67,7 +77,15 @@
+ 		< drbd-kernel-compat/cocci/debugfs_compat_template.cocci.in \
+ 		>> $incdir/.compat.cocci
+     done
++
++    coccilibpath=$(rpm -ql coccinelle|grep standard.h|xargs dirname);
++    echo "  SPATCH_SOURCES: "$*;
++    echo "  COCCI_LIBPATH: "$coccilibpath;
++
+     if [ -e $incdir/.compat.cocci ]; then
++	echo "  GENCOCCIRULES .compat.cocci";
++	cat $incdir/.compat.cocci;
++
+ 	echo "  SPATCH   $chksum  "$K
+ 	# Note: $* (or $@) is NOT make magic variable now, this is a shell script
+ 	# make $@, the target file, was passed as $1, and is now $compat_patch
+@@ -77,8 +95,14 @@
+ 	# we know we don't have white-space in the argument list
+ 
+ 	set +e
++
++	command="spatch --sp-file $incdir/.compat.cocci $@ --macro-file drbd-kernel-compat/cocci_macros.h --macro-file-builtins $coccilibpath/standard.h --iso-file $coccilibpath/standard.iso --very-quiet --all-includes > $compat_patch.tmp 2> $incdir/.spatch.stderr"
++	echo "  SPATCH COMMAND $command  ";
++
+ 	spatch --sp-file "$incdir/.compat.cocci" "$@" \
+ 		--macro-file drbd-kernel-compat/cocci_macros.h \
++		--macro-file-builtins $coccilibpath/standard.h \
++		--iso-file $coccilibpath/standard.iso \
+ 		--very-quiet \
+ 		--all-includes \
+ 		> "$compat_patch.tmp" \
+@@ -94,9 +118,21 @@
+ 	echo "  SPATCH   $chksum  "$K" - nothing to do"
+ 	touch $compat_patch.tmp
+     fi
++
++    echo "  GENSPATCHFILE $compat_patch.tmp  ";
++    cat $compat_patch.tmp;
++
+     if [ -e $incdir/.compat.patch ]; then
++	echo "  EXIST $incdir/.compat.patch  ";
+ 	cat $incdir/.compat.patch >> $compat_patch.tmp
++	cat $compat_patch.tmp;
+     fi
++
++    if [ -e $incdir/.spatch.stderr ]; then
++        echo "  GENSPATCHERR .spatch.stderr";
++        cat $incdir/.spatch.stderr;
++    fi
++
+     mv $compat_patch.tmp $compat_patch
+     # keep it around
+     # to better be able to match the "stderr" warnings to their source files