]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fdisk: kernel/bios sectors and heads need not be global
authorDavidlohr Bueso <dave@gnu.org>
Mon, 23 Apr 2012 10:38:22 +0000 (12:38 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 23 Apr 2012 10:38:22 +0000 (12:38 +0200)
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
fdisk/fdisk.c

index 21fc2444c2537e7dd444d575650e01b548ba2f4b..ab4845895c245cbceb11d3c821fdb6cbf4cedb21 100644 (file)
@@ -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);