From: Simon Arlott <simon@fire.lp0.eu>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
James.Bottomley@HansenPartnership.com
Subject: [PATCH] scsi/sd: Fix size output in MB
Date: Sat, 30 Aug 2008 15:08:43 +0100 [thread overview]
Message-ID: <48B9546B.4010004@simon.arlott.org.uk> (raw)
The capacity printk'd in bytes is divided by 1000000,
whereas 1048576 would be more consistent with the rest
of the OS and disk-related utilities ('df' etc.).
This change replaces the (sz - (sz/625 - 974))/1950
calculation with a simple right shift by 11 bits
(/2048).
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
---
drivers/scsi/sd.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e5e7d78..e6fd6fd 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1441,10 +1441,8 @@ got_data:
sector_t mb = sz;
blk_queue_hardsect_size(queue, hard_sector);
- /* avoid 64-bit division on 32-bit platforms */
- sector_div(sz, 625);
- mb -= sz - 974;
- sector_div(mb, 1950);
+ /* Convert to megabytes (/2048) */
+ mb = sz >> 11;
sd_printk(KERN_NOTICE, sdkp,
"%llu %d-byte hardware sectors (%llu MB)\n",
--
1.5.6.5
--
Simon Arlott
next reply other threads:[~2008-08-30 14:08 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-30 14:08 Simon Arlott [this message]
2008-08-30 17:24 ` [PATCH] scsi/sd: Fix size output in MB James Bottomley
2008-08-30 17:45 ` Matthew Wilcox
2008-08-30 20:59 ` Pierre Ossman
2008-08-30 21:45 ` James Bottomley
2008-08-30 22:13 ` Pierre Ossman
2008-08-30 22:24 ` Simon Arlott
2008-08-30 22:36 ` Matthew Wilcox
2008-08-30 21:02 ` Simon Arlott
2008-08-30 21:03 ` [PATCH] scsi/sd: Fix capacity output to show MB/GB/TB/ Simon Arlott
2008-08-31 1:59 ` James Bottomley
2008-08-31 2:54 ` Matthew Wilcox
2008-08-31 14:25 ` Ingo Oeser
2008-08-31 15:04 ` Simon Arlott
2008-08-31 15:08 ` James Bottomley
2008-08-31 15:13 ` [PATCH 1/2] lib: add generic helper to print sizes rounded to the correct SI range James Bottomley
2008-08-31 15:20 ` Simon Arlott
2008-08-31 15:41 ` James Bottomley
2008-08-31 15:51 ` Matthew Wilcox
2008-08-31 18:54 ` [PATCH] mmc_block: use generic helper to print capacities Pierre Ossman
2008-09-05 20:09 ` James Bottomley
2008-09-05 20:52 ` Pierre Ossman
2008-09-05 21:03 ` James Bottomley
2008-09-06 8:57 ` Pierre Ossman
2008-09-03 3:39 ` [PATCH 1/2] lib: add generic helper to print sizes rounded to the correct SI range Andrew Morton
2008-09-03 14:32 ` James Bottomley
2008-09-03 15:58 ` Andrew Morton
2008-08-31 15:15 ` [PATCH 2/2] sd: use generic helper to print capacities in both binary and SI James Bottomley
2008-08-31 15:08 ` [PATCH] scsi/sd: Fix capacity output to show MB/GB/TB/ Simon Arlott
2008-08-30 21:57 ` [PATCH] scsi/sd: Fix size output in MB Matthew Wilcox
2008-08-30 22:22 ` Simon Arlott
2008-08-31 12:27 ` James Smart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48B9546B.4010004@simon.arlott.org.uk \
--to=simon@fire.lp0.eu \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox