dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0196-devmapper-getroot-use-makedev-instead-of-direct-shif.patch

27a4da
From 5317bbcd5aa96b1c38d888ead78d640ec58d91a4 Mon Sep 17 00:00:00 2001
23d2ea
From: Andrei Borzenkov <arvidjaar@gmail.com>
23d2ea
Date: Sat, 7 Nov 2015 09:46:46 +0300
27a4da
Subject: [PATCH 196/260] 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
27a4da
index d02386b34..de3210232 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
-- 
27a4da
2.13.0
23d2ea