pool/drbd
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1030530 from home:hmzhao:branches:network:ha-clustering:Factory

Browse Source 
- drbd: build error against kernel v6.0.2 (bsc#1204596)
  - add patch:
    + bsc-1204596_01-block-remove-blk_cleanup_disk.patch
    + bsc-1204596_02-drbd-stop-using-bdevname-in-drbd_report_io_error.patch

OBS-URL: https://build.opensuse.org/request/show/1030530
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=140
This commit is contained in:
heming zhao 2022-10-22 13:07:59 +00:00 committed by Git OBS Bridge
parent 8cb897e5f9
commit fb29c7bf26
4 changed files with 97 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
bsc-1204596_01-block-remove-blk_cleanup_disk.patch Normal file
View File

@ -0,0 +1,49 @@
/*
This patch is related with following upstream kernel commit.
blk_alloc_disk__no_present.cocci doesn't work for this patch.
*/
From 8b9ab62662048a3274361c7e5f64037c2c133e2c Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Sun, 19 Jun 2022 08:05:52 +0200
Subject: [PATCH] block: remove blk_cleanup_disk
blk_cleanup_disk is nothing but a trivial wrapper for put_disk now,
so remove it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20220619060552.1850436-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
diff -Nupr a/drbd/drbd_main.c b/drbd/drbd_main.c
--- a/drbd/drbd_main.c 2022-10-22 19:16:29.466820303 +0800
+++ b/drbd/drbd_main.c 2022-10-22 19:17:08.098772762 +0800
@@ -2928,7 +2928,7 @@ static void drbd_device_finalize_work_fn
device->bitmap = NULL;
}
- blk_cleanup_disk(device->vdisk);
+ put_disk(device->vdisk);
kfree(device);
@@ -3810,7 +3810,7 @@ enum drbd_ret_code drbd_create_device(st
return NO_ERROR;
out_cleanup_disk:
- blk_cleanup_disk(disk);
+ put_disk(disk);
out_remove_peer_device:
list_add_rcu(&tmp, &device->peer_devices);
list_del_init(&device->peer_devices);
@@ -3848,7 +3848,7 @@ out_no_peer_device:
out_no_bitmap:
__free_page(device->md_io.page);
out_no_io_page:
- blk_cleanup_disk(disk);
+ put_disk(disk);
out_no_disk:
kref_put(&resource->kref, drbd_destroy_resource);
kref_debug_put(&resource->kref_debug, 4);

36
bsc-1204596_02-drbd-stop-using-bdevname-in-drbd_report_io_error.patch Normal file
View File

@ -0,0 +1,36 @@
From 1b70ccecaed4c3c50239e8409156fb447f965554 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 13 Jul 2022 07:53:11 +0200
Subject: [PATCH] drbd: stop using bdevname in drbd_report_io_error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Just use the %pg format specifier instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220713055317.1888500-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
diff -Nupr a/drbd/drbd_req.c b/drbd/drbd_req.c
--- a/drbd/drbd_req.c 2022-10-22 19:32:24.033651322 +0800
+++ b/drbd/drbd_req.c 2022-10-22 19:33:01.433605547 +0800
@@ -745,11 +745,11 @@ static void drbd_report_io_error(struct
if (!drbd_ratelimit())
return;
- drbd_warn(device, "local %s IO error sector %llu+%u on %s\n",
+ drbd_warn(device, "local %s IO error sector %llu+%u on %pg\n",
(req->local_rq_state & RQ_WRITE) ? "WRITE" : "READ",
(unsigned long long)req->i.sector,
req->i.size >> 9,
- bdevname(device->ldev->backing_bdev, b));
+ device->ldev->backing_bdev);
}
/* Helper for HANDED_OVER_TO_NETWORK.

8
drbd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Oct 22 12:23:00 UTC 2022 - Heming Zhao <heming.zhao@suse.com>
- drbd: build error against kernel v6.0.2 (bsc#1204596)
- add patch:
+ bsc-1204596_01-block-remove-blk_cleanup_disk.patch
+ bsc-1204596_02-drbd-stop-using-bdevname-in-drbd_report_io_error.patch
-------------------------------------------------------------------
Tue Aug 23 00:13:00 UTC 2022 - Heming Zhao <heming.zhao@suse.com>

4
drbd.spec
View File

@ -56,6 +56,8 @@ Patch19: bsc-1202600_01-remove-QUEUE_FLAG_DISCARD.patch
Patch20: bsc-1202600_02-dax-introduce-DAX_RECOVERY_WRITE-dax-access-mode.patch
Patch21: bsc-1202600_03-block-decouple-REQ_OP_SECURE_ERASE-from-REQ_OP_DISCA.patch
Patch22: bsc-1202600_04-remove-assign_p_sizes_qlim.patch
Patch23: bsc-1204596_01-block-remove-blk_cleanup_disk.patch
Patch24: bsc-1204596_02-drbd-stop-using-bdevname-in-drbd_report_io_error.patch
Patch99: suse-coccinelle.patch
#https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py
BuildRequires: coccinelle >= 1.0.8
@ -111,6 +113,8 @@ installed kernel.
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch99 -p1
mkdir source