From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tejun Heo Subject: [PATCH 2/3] dmraid: add alt_size to dev_info Date: Sun, 01 Feb 2009 12:00:36 +0900 Message-ID: <49851054.10605@kernel.org> References: <1233456951-992-1-git-send-email-tj@kernel.org> <49851012.8070904@kernel.org> Reply-To: device-mapper development Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <49851012.8070904@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: jeff@garzik.org, linux-ide@vger.kernel.org, jens.axboe@oracle.com, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, James.Bottomley@HansenPartnership.com, Mauelshagen@redhat.c List-Id: linux-scsi@vger.kernel.org Add alt_size to dev_info and set it during device scanning if available. Signed-off-by: Tejun Heo --- include/dmraid/metadata.h | 1 + lib/device/scan.c | 51 ++++++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/include/dmraid/metadata.h b/include/dmraid/metadata.h index 91bd221..538043e 100644 --- a/include/dmraid/metadata.h +++ b/include/dmraid/metadata.h @@ -120,6 +120,7 @@ struct dev_info { char *path; /* Actual device node path. */ char *serial; /* ATA/SCSI serial number. */ uint64_t sectors; /* Device size. */ + uint64_t alt_sectors; /* Alternative device size. (BIOS size) */ }; /* Metadata areas and size stored on a RAID device. */ diff --git a/lib/device/scan.c b/lib/device/scan.c index e9618c2..3befb08 100644 --- a/lib/device/scan.c +++ b/lib/device/scan.c @@ -233,29 +233,52 @@ sysfs_get_size(struct lib_context *lc, struct dev_info *di, { int ret = 0; char buf[22], *sysfs_file; - const char *sysfs_size = "size"; + const char *sysfs_size = "size", *sysfs_alt_size = "alt_size"; FILE *f; if (!(sysfs_file = dbg_malloc(strlen(path) + strlen(name) + - strlen(sysfs_size) + 3))) + max(strlen(sysfs_size), + strlen(sysfs_alt_size)) + 3))) return log_alloc_err(lc, __func__); + /* read size */ sprintf(sysfs_file, "%s/%s/%s", path, name, sysfs_size); - if ((f = fopen(sysfs_file, "r"))) { - /* Use fread+sscanf for klibc compatibility. */ - if (fread(buf, sizeof(char), sizeof buf - 1, f) && - (ret = sscanf(buf, "%" PRIu64, &di->sectors)) != 1) { - ret = 0; - log_err(lc, "reading disk size for %s from sysfs", - di->path); - } - - fclose(f); - } else + if (!(f = fopen(sysfs_file, "r"))) { log_err(lc, "opening %s", sysfs_file); + goto out; + } - dbg_free(sysfs_file); + /* Use fread+sscanf for klibc compatibility. */ + if (!fread(buf, sizeof(char), sizeof buf - 1, f) || + sscanf(buf, "%" PRIu64, &di->sectors) != 1) { + log_err(lc, "reading disk size for %s from sysfs", + di->path); + goto out; + } + fclose(f); + + /* read alt_size, missing alt_size isn't an error */ + sprintf(sysfs_file, "%s/%s/%s", path, name, sysfs_alt_size); + if (!(f = fopen(sysfs_file, "r"))) { + if (errno == ENOENT) + ret = 1; + else + log_err(lc, "opening %s", sysfs_file); + goto out; + } + + if (!fread(buf, sizeof(char), sizeof buf - 1, f) || + sscanf(buf, "%" PRIu64, &di->alt_sectors) != 1) { + log_err(lc, "reading disk alt size for %s from sysfs", + di->path); + goto out; + } + ret = 1; +out: + if (f) + fclose(f); + dbg_free(sysfs_file); return ret; } -- 1.6.0.2