From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@suse.de, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, virtualization@lists.osdl.org
Cc: "K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Abhishek Kane <v-abkane@microsoft.com>,
Hank Janssen <hjanssen@microsoft.com>
Subject: [PATCH 04/22] Staging: hv: Get rid of the forward declaration of blkvsc_getgeo()
Date: Mon, 28 Mar 2011 10:00:35 -0700 [thread overview]
Message-ID: <1301331653-26265-4-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1301331653-26265-1-git-send-email-kys@microsoft.com>
Get rid of the forward declaration of blkvsc_getgeo() by moving the code around.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 162 +++++++++++++++++++-------------------
1 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index cd3a019..a0c1fe8 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -272,6 +272,87 @@ static int blkvsc_open(struct block_device *bdev, fmode_t mode)
return 0;
}
+
+static int blkvsc_getgeo(struct block_device *bd, struct hd_geometry *hg)
+{
+ sector_t total_sectors = get_capacity(bd->bd_disk);
+ sector_t cylinder_times_heads = 0;
+ sector_t temp = 0;
+
+ int sectors_per_track = 0;
+ int heads = 0;
+ int cylinders = 0;
+ int rem = 0;
+
+ if (total_sectors > (65535 * 16 * 255))
+ total_sectors = (65535 * 16 * 255);
+
+ if (total_sectors >= (65535 * 16 * 63)) {
+ sectors_per_track = 255;
+ heads = 16;
+
+ cylinder_times_heads = total_sectors;
+ /* sector_div stores the quotient in cylinder_times_heads */
+ rem = sector_div(cylinder_times_heads, sectors_per_track);
+ } else {
+ sectors_per_track = 17;
+
+ cylinder_times_heads = total_sectors;
+ /* sector_div stores the quotient in cylinder_times_heads */
+ rem = sector_div(cylinder_times_heads, sectors_per_track);
+
+ temp = cylinder_times_heads + 1023;
+ /* sector_div stores the quotient in temp */
+ rem = sector_div(temp, 1024);
+
+ heads = temp;
+
+ if (heads < 4)
+ heads = 4;
+
+
+ if (cylinder_times_heads >= (heads * 1024) || (heads > 16)) {
+ sectors_per_track = 31;
+ heads = 16;
+
+ cylinder_times_heads = total_sectors;
+ /*
+ * sector_div stores the quotient in
+ * cylinder_times_heads
+ */
+ rem = sector_div(cylinder_times_heads,
+ sectors_per_track);
+ }
+
+ if (cylinder_times_heads >= (heads * 1024)) {
+ sectors_per_track = 63;
+ heads = 16;
+
+ cylinder_times_heads = total_sectors;
+ /*
+ * sector_div stores the quotient in
+ * cylinder_times_heads
+ */
+ rem = sector_div(cylinder_times_heads,
+ sectors_per_track);
+ }
+ }
+
+ temp = cylinder_times_heads;
+ /* sector_div stores the quotient in temp */
+ rem = sector_div(temp, heads);
+ cylinders = temp;
+
+ hg->heads = heads;
+ hg->sectors = sectors_per_track;
+ hg->cylinders = cylinders;
+
+ DPRINT_INFO(BLKVSC_DRV, "CHS (%d, %d, %d)", cylinders, heads,
+ sectors_per_track);
+
+ return 0;
+}
+
/* Static decl */
static int blkvsc_probe(struct device *dev);
static int blkvsc_remove(struct device *device);
@@ -279,7 +360,6 @@ static void blkvsc_shutdown(struct device *device);
static int blkvsc_release(struct gendisk *disk, fmode_t mode);
static int blkvsc_revalidate_disk(struct gendisk *gd);
-static int blkvsc_getgeo(struct block_device *bd, struct hd_geometry *hg);
static int blkvsc_ioctl(struct block_device *bd, fmode_t mode,
unsigned cmd, unsigned long argument);
static void blkvsc_request(struct request_queue *queue);
@@ -1424,86 +1504,6 @@ static int blkvsc_revalidate_disk(struct gendisk *gd)
return 0;
}
-static int blkvsc_getgeo(struct block_device *bd, struct hd_geometry *hg)
-{
- sector_t total_sectors = get_capacity(bd->bd_disk);
- sector_t cylinder_times_heads = 0;
- sector_t temp = 0;
-
- int sectors_per_track = 0;
- int heads = 0;
- int cylinders = 0;
- int rem = 0;
-
- if (total_sectors > (65535 * 16 * 255))
- total_sectors = (65535 * 16 * 255);
-
- if (total_sectors >= (65535 * 16 * 63)) {
- sectors_per_track = 255;
- heads = 16;
-
- cylinder_times_heads = total_sectors;
- /* sector_div stores the quotient in cylinder_times_heads */
- rem = sector_div(cylinder_times_heads, sectors_per_track);
- } else {
- sectors_per_track = 17;
-
- cylinder_times_heads = total_sectors;
- /* sector_div stores the quotient in cylinder_times_heads */
- rem = sector_div(cylinder_times_heads, sectors_per_track);
-
- temp = cylinder_times_heads + 1023;
- /* sector_div stores the quotient in temp */
- rem = sector_div(temp, 1024);
-
- heads = temp;
-
- if (heads < 4)
- heads = 4;
-
-
- if (cylinder_times_heads >= (heads * 1024) || (heads > 16)) {
- sectors_per_track = 31;
- heads = 16;
-
- cylinder_times_heads = total_sectors;
- /*
- * sector_div stores the quotient in
- * cylinder_times_heads
- */
- rem = sector_div(cylinder_times_heads,
- sectors_per_track);
- }
-
- if (cylinder_times_heads >= (heads * 1024)) {
- sectors_per_track = 63;
- heads = 16;
-
- cylinder_times_heads = total_sectors;
- /*
- * sector_div stores the quotient in
- * cylinder_times_heads
- */
- rem = sector_div(cylinder_times_heads,
- sectors_per_track);
- }
- }
-
- temp = cylinder_times_heads;
- /* sector_div stores the quotient in temp */
- rem = sector_div(temp, heads);
- cylinders = temp;
-
- hg->heads = heads;
- hg->sectors = sectors_per_track;
- hg->cylinders = cylinders;
-
- DPRINT_INFO(BLKVSC_DRV, "CHS (%d, %d, %d)", cylinders, heads,
- sectors_per_track);
-
- return 0;
-}
-
static int blkvsc_ioctl(struct block_device *bd, fmode_t mode,
unsigned cmd, unsigned long argument)
{
--
1.7.4.1
next prev parent reply other threads:[~2011-03-28 17:00 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 17:00 [PATCH 00/22] Staging: hv: Cleanup-storage-drivers-phase-III K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 01/22] Staging: hv: Get rid of the forward declaration of blkvsc_submit_request() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 02/22] Staging: hv: Get rid of the forward declaration of blkvsc_media_changed() K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 03/22] Staging: hv: Get rid of the forward declaration of blkvsc_open() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan [this message]
2011-03-28 17:00 ` [PATCH 05/22] Staging: hv: Get rid of the forward declaration of blkvsc_init_rw() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 06/22] Staging: hv: Get rid of the forward declaration of blkvsc_ioctl() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 07/22] Staging: hv: Get rid of the forward declaration of blkvsc_cmd_completion() K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 08/22] Staging: hv: Get rid of the forward declaration of blkvsc_do_flush() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 09/22] Staging: hv: Get rid of the forward declaration of blkvsc_cancel_pending_reqs() K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 10/22] Staging: hv: Get rid of the forward declaration of blkvsc_remove() K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 11/22] Staging: hv: Get rid of the forward declaration of blkvsc_shutdown() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 12/22] Staging: hv: Get rid of the forward declaration for blkvsc_release() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 13/22] Staging: hv: Get rid of the forward declaration for blkvsc_do_read_capacity() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 14/22] Staging: hv: Get rid of the forward declaration of blkvsc_do_read_capacity16() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 15/22] Staging: hv: Get rid of the forward declaration of blkvsc_revalidate_disk() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 16/22] Staging: hv: Get rid of the forward declaration for blkvsc_do_inquiry() K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 17/22] Staging: hv: Get rid of the forward declaration for blkvsc_do_request() K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 18/22] Staging: hv: Get rid of the forward declaration for blkvsc_do_pending_reqs() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 19/22] Staging: hv: Get rid of the forward declaration for blkvsc_request() K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 20/22] Staging: hv: Move some definitions/declarations to be earlier in the file K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 21/22] Staging: hv: Move module parameter to " K. Y. Srinivasan
2011-03-28 17:00 ` K. Y. Srinivasan
2011-03-28 17:00 ` [PATCH 22/22] Staging: hv: Get rid of some dead code in blkvsc_drv.c K. Y. Srinivasan
2011-04-05 4:59 ` [PATCH 00/22] Staging: hv: Cleanup-storage-drivers-phase-III Greg KH
2011-04-05 4:59 ` Greg KH
2011-04-05 13:58 ` KY Srinivasan
2011-04-05 15:10 ` Greg KH
2011-04-05 15:29 ` KY Srinivasan
2011-04-06 22:59 ` KY Srinivasan
-- strict thread matches above, loose matches on Subject: below --
2011-04-06 21:34 [RESEND] " K. Y. Srinivasan
2011-04-06 21:34 ` [PATCH 01/22] Staging: hv: Get rid of the forward declaration of blkvsc_submit_request() K. Y. Srinivasan
2011-04-06 21:35 ` [PATCH 04/22] Staging: hv: Get rid of the forward declaration of blkvsc_getgeo() K. Y. Srinivasan
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=1301331653-26265-4-git-send-email-kys@microsoft.com \
--to=kys@microsoft.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=haiyangz@microsoft.com \
--cc=hjanssen@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=v-abkane@microsoft.com \
--cc=virtualization@lists.osdl.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.