From 43b08e1491229dd69fb7260d1692b4e8839438c0 Mon Sep 17 00:00:00 2001 From: George Kennedy Date: Fri, 24 Feb 2017 10:13:43 -0500 Subject: [PATCH] SPARC64: Fix vds_vtoc_set_default debug with large disks Fix vds_vtoc_set_default debug, which breaks with large capacity drives (i.e. 1.6TB). Signed-off-by: George Kennedy Reviewed-by: Jagannathan Raman Reviewed-by: Bijan Mottahedeh Orabug: 25423802 Signed-off-by: Allen Pais --- drivers/block/vds/vds_vtoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/vds/vds_vtoc.c b/drivers/block/vds/vds_vtoc.c index a9512dffdcfe..d7963a68071d 100644 --- a/drivers/block/vds/vds_vtoc.c +++ b/drivers/block/vds/vds_vtoc.c @@ -1,7 +1,7 @@ /* * vds_vtoc.c: LDOM Virtual Disk Server. * - * Copyright (C) 2014 Oracle. All rights reserved. + * Copyright (C) 2014, 2017 Oracle. All rights reserved. */ #include "vds.h" @@ -167,9 +167,9 @@ static void vds_vtoc_set_default(struct vds_port *port, struct dk_label *label) vdsdbg(IOC, "requested disk size: %ld bytes\n", disk_size); vdsdbg(IOC, "setup: ncyl=%d nhead=%d nsec=%d\n", label->dkl_pcyl, label->dkl_nhead, label->dkl_nsect); - vdsdbg(IOC, "provided disk size: %lld bytes\n", (uint64_t) - (label->dkl_pcyl * label->dkl_nhead * - label->dkl_nsect * bsize)); + vdsdbg(IOC, "provided disk size: %lld bytes\n", + ((uint64_t)label->dkl_pcyl * (uint64_t)label->dkl_nhead * + (uint64_t)label->dkl_nsect * (uint64_t)bsize)); vd_get_readable_size(disk_size, &size, &unit); -- 2.50.1