From 2fa658249c1653242b94cb9155ac96eb88456681 Mon Sep 17 00:00:00 2001 From: basebuilder_pel7ppc64bebuilder0 Date: Thu, 17 May 2018 19:13:32 +0200 Subject: [PATCH] util linux patches Signed-off-by: basebuilder_pel7ppc64bebuilder0 --- ...6-fdisk-use-sysfs_devno_is_wholedisk.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 SOURCES/0116-fdisk-use-sysfs_devno_is_wholedisk.patch diff --git a/SOURCES/0116-fdisk-use-sysfs_devno_is_wholedisk.patch b/SOURCES/0116-fdisk-use-sysfs_devno_is_wholedisk.patch new file mode 100644 index 00000000..3a90e5ed --- /dev/null +++ b/SOURCES/0116-fdisk-use-sysfs_devno_is_wholedisk.patch @@ -0,0 +1,57 @@ +From e86fe103accdf5dd688b3710c873094cfa41ae5f Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 21 Mar 2017 15:11:29 +0100 +Subject: [PATCH 116/116] fdisk: use sysfs_devno_is_wholedisk() + +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1402183 +Signed-off-by: Karel Zak +--- + lib/wholedisk.c | 23 ++++++++--------------- + 1 file changed, 8 insertions(+), 15 deletions(-) + +diff --git a/lib/wholedisk.c b/lib/wholedisk.c +index 5161a1e..7c63204 100644 +--- a/lib/wholedisk.c ++++ b/lib/wholedisk.c +@@ -1,14 +1,10 @@ +-/* +- * No copyright is claimed. This code is in the public domain; do with +- * it what you wish. +- * +- * Written by Karel Zak +- */ ++ + #include + #include + #include + + #include "blkdev.h" ++#include "sysfs.h" + #include "wholedisk.h" + + int is_whole_disk_fd(int fd, const char *name) +@@ -35,16 +31,13 @@ int is_whole_disk_fd(int fd, const char *name) + + int is_whole_disk(const char *name) + { +- int fd = -1, res = 0; +-#ifdef HDIO_GETGEO +- fd = open(name, O_RDONLY|O_CLOEXEC); +- if (fd != -1) +-#endif +- res = is_whole_disk_fd(fd, name); ++ dev_t devno = sysfs_devname_to_devno(name, NULL); ++ ++ if (sysfs_devno_is_lvm_private(devno) || ++ sysfs_devno_is_wholedisk(devno) <= 0) ++ return 0; + +- if (fd != -1) +- close(fd); +- return res; ++ return 1; + } + + #ifdef TEST_PROGRAM +-- +2.9.3