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 <george.kennedy@oracle.com>
Reviewed-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
Orabug: 25423802
Signed-off-by: Allen Pais <allen.pais@oracle.com>

diff --git a/drivers/block/vds/vds_vtoc.c b/drivers/block/vds/vds_vtoc.c
index a9512dffdcfe3747a35a7a4fed1485aca86488c0..d7963a68071dbef3e6d8030a6d7e20a17a94e20f 100644 (file)
--- 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);