d1207a7795
Updated to latest upstrem 0.4.9 code: multipath-tools-130222
(git commit id: 67b82ad6fe280caa1770025a6bb8110b633fa136)
Refresh 0001-RH-dont_start_with_no_config.patch
Modify 0002-RH-multipath.rules.patch
Modify 0003-RH-Make-build-system-RH-Fedora-friendly.patch
Refresh 0004-RH-multipathd-blacklist-all-by-default.patch
Refresh 0005-RH-add-mpathconf.patch
Refresh 0006-RH-add-find-multipaths.patch
Add 0008-RH-revert-partition-changes.patch
Rename 0008-RH-RHEL5-style-partitions.patch to
0009-RH-RHEL5-style-partitions.patch
Rename 0009-RH-dont-remove-map-on-enomem.patch to
0010-RH-dont-remove-map-on-enomem.patch
Rename 0010-RH-deprecate-uid-gid-mode.patch to
0011-RH-deprecate-uid-gid-mode.patch
Rename 0013-RH-kpartx-msg.patch to 0012-RH-kpartx-msg.patch
Rename 0035-RHBZ-883981-cleanup-rpmdiff-issues.patch to
0013-RHBZ-883981-cleanup-rpmdiff-issues.patch
Rename 0039-RH-handle-other-sector-sizes.patch to
0014-RH-handle-other-sector-sizes.patch
Rename 0040-RH-fix-output-buffer.patch to 0015-RH-fix-output-buffer.patch
Add 0016-RH-dont-print-ghost-messages.patch
Add 0017-RH-fix-sigusr1.patch
* Actually this fixes a number of issues related to signals
Rename 0018-RH-remove-config-dups.patch to 0018-RH-fix-factorize.patch
* just the part that isn't upstream
Add 0019-RH-fix-sockets.patch
* makes abstract multipathd a cli sockets use the correct name.
Set find_multipaths in the default config
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
---
|
|
kpartx/gpt.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
Index: multipath-tools-120821/kpartx/gpt.c
|
|
===================================================================
|
|
--- multipath-tools-120821.orig/kpartx/gpt.c
|
|
+++ multipath-tools-120821/kpartx/gpt.c
|
|
@@ -637,6 +637,7 @@ read_gpt_pt (int fd, struct slice all, s
|
|
uint32_t i;
|
|
int n = 0;
|
|
int last_used_index=-1;
|
|
+ int sector_size_mul = get_sector_size(fd)/512;
|
|
|
|
if (!find_valid_gpt (fd, &gpt, &ptes) || !gpt || !ptes) {
|
|
if (gpt)
|
|
@@ -652,9 +653,11 @@ read_gpt_pt (int fd, struct slice all, s
|
|
sp[n].size = 0;
|
|
n++;
|
|
} else {
|
|
- sp[n].start = __le64_to_cpu(ptes[i].starting_lba);
|
|
- sp[n].size = __le64_to_cpu(ptes[i].ending_lba) -
|
|
- __le64_to_cpu(ptes[i].starting_lba) + 1;
|
|
+ sp[n].start = sector_size_mul *
|
|
+ __le64_to_cpu(ptes[i].starting_lba);
|
|
+ sp[n].size = sector_size_mul *
|
|
+ (__le64_to_cpu(ptes[i].ending_lba) -
|
|
+ __le64_to_cpu(ptes[i].starting_lba) + 1);
|
|
last_used_index=n;
|
|
n++;
|
|
}
|