Blame SOURCES/0197-devmapper-getroot-use-makedev-instead-of-direct-shif.patch
|
 |
23d2ea |
From 580b04b48c7e727d666647737b0b39279c9a0b9e Mon Sep 17 00:00:00 2001
|
|
|
23d2ea |
From: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
|
23d2ea |
Date: Sat, 7 Nov 2015 09:46:46 +0300
|
|
|
23d2ea |
Subject: [PATCH 197/198] devmapper/getroot: use makedev instead of direct
|
|
|
23d2ea |
shift
|
|
|
23d2ea |
|
|
|
23d2ea |
Fixes device detection with large number of devices.
|
|
|
23d2ea |
|
|
|
23d2ea |
Reported by Tim Wallberg <twalberg@comcast.net>
|
|
|
23d2ea |
|
|
|
23d2ea |
(cherry picked from commit 349a381df0ce2e809506f7b166bf952f97407330)
|
|
|
23d2ea |
|
|
|
23d2ea |
Resolves: rhbz#1279599
|
|
|
23d2ea |
---
|
|
|
23d2ea |
grub-core/osdep/devmapper/getroot.c | 3 +--
|
|
|
23d2ea |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
23d2ea |
|
|
|
23d2ea |
diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c
|
|
|
23d2ea |
index d02386b..de32102 100644
|
|
|
23d2ea |
--- a/grub-core/osdep/devmapper/getroot.c
|
|
|
23d2ea |
+++ b/grub-core/osdep/devmapper/getroot.c
|
|
|
23d2ea |
@@ -204,8 +204,7 @@ grub_util_devmapper_part_to_disk (struct stat *st,
|
|
|
23d2ea |
&major, &minor, 0))
|
|
|
23d2ea |
{
|
|
|
23d2ea |
*is_part = 1;
|
|
|
23d2ea |
- return grub_find_device ("/dev",
|
|
|
23d2ea |
- (major << 8) | minor);
|
|
|
23d2ea |
+ return grub_find_device ("/dev", makedev (major, minor));
|
|
|
23d2ea |
}
|
|
|
23d2ea |
*is_part = 0;
|
|
|
23d2ea |
return xstrdup (path);
|
|
|
23d2ea |
--
|
|
|
23d2ea |
2.7.4
|
|
|
23d2ea |
|