From d0c2ffc90b9ee0e7b741d1c4b644cdf79f1d922b Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Wed, 20 May 2015 11:57:11 +0200 Subject: [PATCH] fdasd: skip partition check and BLKRRPART ioctl for emulated devices If 'fdasd -f' is called we cannot rely on the partition detection via a simple check of the minor number, so the check should be suppressed. Similarly, not every emulated device supports the BLKRRPART ioctl, so we should be suppressing the error message for these devices, too. Signed-off-by: Hannes Reinecke --- fdasd/fdasd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) Index: s390-tools-2.30.0/fdasd/fdasd.c =================================================================== --- s390-tools-2.30.0.orig/fdasd/fdasd.c +++ s390-tools-2.30.0/fdasd/fdasd.c @@ -1231,10 +1231,12 @@ static int fdasd_get_volser(fdasd_anchor */ static void fdasd_reread_partition_table(fdasd_anchor_t *anc) { + int rc = 0 ; if (!anc->silent) printf("rereading partition table...\n"); - if (dasd_reread_partition_table(options.device, 5) != 0) { + rc = dasd_reread_partition_table(options.device, 1); + if (rc == EINVAL && !anc->force_virtual) { fdasd_error(anc, unable_to_ioctl, "Error while rereading " "partition table.\nPlease reboot!"); }