[PATCH 3/8] fdisk: kernel/bios sectors and heads need not be global

[PATCH 3/8] fdisk: kernel/bios sectors and heads need not be global

[Davidlohr Bueso]

From: Davidlohr Bueso <dave@gnu.org>

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
 fdisk/fdisk.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 0954028..1c0d7d8 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -225,8 +225,7 @@ int	fd,				/* the disk */
 	partitions = 4;			/* maximum partition + 1 */
 
 unsigned int	user_cylinders, user_heads, user_sectors;
-unsigned int	pt_heads, pt_sectors;
-unsigned int	kern_heads, kern_sectors;
+unsigned int   pt_heads, pt_sectors;
 
 unsigned long long sector_offset = 1, extended_offset = 0, sectors;
 
@@ -998,10 +997,10 @@ update_sector_offset(void)
 void
 get_geometry(int fd, struct geom *g) {
 	unsigned long long llcyls, nsects = 0;
+	unsigned int kern_heads = 0, kern_sectors = 0;
 
 	get_topology(fd);
 	heads = cylinders = sectors = 0;
-	kern_heads = kern_sectors = 0;
 	pt_heads = pt_sectors = 0;
 
 	blkdev_get_geometry(fd, &kern_heads, &kern_sectors);
-- 
1.7.4.1

Re: [PATCH 3/8] fdisk: kernel/bios sectors and heads need not be global

[Karel Zak]

On Mon, Apr 16, 2012 at 11:44:39AM +0200, Davidlohr Bueso wrote:
> fdisk/fdisk.c |    5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com