From 00851f9b5c049d18a6d49d69ec2d5d13544f5616 Mon Sep 17 00:00:00 2001 From: Frederic Martinsons Date: Fri, 27 Jan 2023 06:38:15 +0100 Subject: [PATCH] Get back the old way of getting device geometry info This is a mix between a revert of 61dd3d4c5eb782eb43caa95342e63727db3f8281 and an adaptation for 52360db2f5397b7842d2ed90bf946c5e8fa91750 See more info at https://lists.gnu.org/archive/html/bug-parted/2023-01/msg00002.html Signed-off-by: Frederic Martinsons --- libparted/arch/linux.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c index 09ec781..e337aae 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c @@ -868,7 +868,6 @@ _device_probe_geometry (PedDevice* dev) struct stat dev_stat; struct hd_geometry geometry; int geometry_is_valid = 0; - int sector_size = 0; if (!_device_stat (dev, &dev_stat)) return 0; @@ -888,16 +887,7 @@ _device_probe_geometry (PedDevice* dev) geometry_is_valid = !ioctl (arch_specific->fd, HDIO_GETGEO, &geometry) && geometry.sectors && geometry.heads; -#if defined __s390__ || defined __s390x__ if (geometry_is_valid) { -#else - if (!ioctl (arch_specific->fd, BLKSSZGET, §or_size)) { - /* get the sector count first */ - dev->bios_geom.sectors = 1 + (sector_size / PED_SECTOR_SIZE_DEFAULT); - dev->bios_geom.heads = 255; - } else if (geometry_is_valid) { - /* if BLKSSZGET failed, use deprecated HDIO_GETGEO result */ -#endif dev->bios_geom.sectors = geometry.sectors; dev->bios_geom.heads = geometry.heads; } else { -- 2.34.1