4e5f7cbf78
- drbd: fix build error against kernel v6.1.1 (bsc#1206791) * update bsc-1201335_06-bdi.patch commit log (no code change) + bsc-1201335_06-bdi.patch * update bsc-1202600_02-dax-introduce-DAX_RECOVERY_WRITE-dax-access-mode.patch (no code change) + bsc-1202600_02-dax-introduce-DAX_RECOVERY_WRITE-dax-access-mode.patch * using upstream patch to replace exist patch - bsc-1204596_02-drbd-stop-using-bdevname-in-drbd_report_io_error.patch + bsc-1204596_02-drbd-remove-usage-of-bdevname.patch * add new patches + bsc-1206791-01-drbd-add-comments-explaining-removal-of-bdi-congesti.patch + bsc-1206791-02-drbd-fix-static-analysis-warnings.patch + bsc-1206791-03-drbd-fix-warning-about-initializing-multiple-struct-.patch + bsc-1206791-04-blk_queue_split__no_present.patch + bsc-1206791-05-prandom_u32_max.patch + bsc-1206791-06-write_zeroes__no_capable.patch + bsc-1206791-07-drbd-fix-use-after-free-bugs-in-get_initial_state.patch + bsc-1206791-08-lib-lru_cache-Fixed-array-overflow-caused-by-incorre.patch + bsc-1206791-09-pmem-use-fs_dax_get_by_bdev-instead-of-dax_get_by_ho.patch OBS-URL: https://build.opensuse.org/request/show/1056192 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=142
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From 998a1faccbbb7e7b6d1042e7fe841734671ee365 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?=
|
|
<christoph.boehmwalder@linbit.com>
|
|
Date: Wed, 6 Apr 2022 13:39:44 +0200
|
|
Subject: [PATCH] pmem: use fs_dax_get_by_bdev instead of dax_get_by_host
|
|
|
|
The {fs,}dax_get_by_host helpers went away.
|
|
|
|
---
|
|
by heming.zhao on 20230105
|
|
|
|
This patch partly refer code from drbd-9.1 branch commit
|
|
a68200c121de9e17a73a53962697fa32239e99f6
|
|
|
|
---
|
|
|
|
--- drbd-9.0.30~1+git.8e9c0812/drbd/drbd_dax_pmem.c 2023-01-05 20:50:39.022187673 +0800
|
|
+++ b/drbd/drbd_dax_pmem.c 2023-01-05 20:40:10.878947325 +0800
|
|
@@ -56,14 +56,11 @@ static int map_superblock_for_dax(struct
|
|
*/
|
|
int drbd_dax_open(struct drbd_backing_dev *bdev)
|
|
{
|
|
- const char *disk_name = bdev->md_bdev->bd_disk->disk_name;
|
|
struct dax_device *dax_dev;
|
|
int err;
|
|
+ u64 part_off;
|
|
|
|
- if (!blk_queue_dax(bdev->md_bdev->bd_disk->queue))
|
|
- return -ENODEV;
|
|
-
|
|
- dax_dev = dax_get_by_host(disk_name);
|
|
+ dax_dev = fs_dax_get_by_bdev(bdev->md_bdev, &part_off, NULL, NULL);
|
|
if (!dax_dev)
|
|
return -ENODEV;
|
|
|