2b0cd7cceb
Rebased on top of Martin Wilck's queue of ACKed upstream commits * https://github.com/openSUSE/multipath-tools/tree/upstream-queue * All previous patches have been reordered, with the exception of 0011-libdmmp-Add-support-for-upcoming-json-c-0.14.0.patch which has been replaced with 0029-fix-boolean-value-with-json-c-0.14.patch Modify 0054-RH-add-mpathconf.patch * remove default enable_foreign and property blacklist_exceptions settings, and deal with the builtin default change from 0031-libmultipath-set-enable_foreign-to-NONE-by-default.patch. Fixes bz #1853668 Add 0048-Makefile.inc-trim-extra-information-from-systemd-ver.patch Add 0049-kpartx-fix-Wsign-compare-error.patch * The above two patches have been submitted upstream
27 lines
821 B
Diff
27 lines
821 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Mon, 6 Jul 2020 17:28:46 -0500
|
|
Subject: [PATCH] kpartx: fix -Wsign-compare error
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
kpartx/kpartx.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
|
|
index c24ad6d9..653ce0c8 100644
|
|
--- a/kpartx/kpartx.c
|
|
+++ b/kpartx/kpartx.c
|
|
@@ -738,7 +738,7 @@ struct block {
|
|
/* blknr is always in 512 byte blocks */
|
|
char *
|
|
getblock (int fd, unsigned int blknr) {
|
|
- unsigned int secsz = get_sector_size(fd);
|
|
+ int secsz = get_sector_size(fd);
|
|
unsigned int blks_per_sec = secsz / 512;
|
|
unsigned int secnr = blknr / blks_per_sec;
|
|
unsigned int blk_off = (blknr % blks_per_sec) * 512;
|
|
--
|
|
2.17.2
|
|
|