[syslinux:master] extlinux/main.c: Fix geometry handling

[syslinux-bot for Gene Cumm]

Commit-ID:  73cd9bf26066cad0d4a483e31e1d89802a7ca1f9
Gitweb:     http://syslinux.zytor.com/commit/73cd9bf26066cad0d4a483e31e1d89802a7ca1f9
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Wed, 11 May 2011 12:03:30 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Wed, 11 May 2011 14:16:51 -0400

extlinux/main.c: Fix geometry handling

1) ioctl HDIO_GETGEO expects a pointer to a struct hd_geometry
2) struct stat's st_dev is the parent file used; st_rdev is what we want

Reported-by: Michael Tokarev <mjt at tls.msk.ru>
Tested-By: Michael Tokarev <mjt at tls.msk.ru>
Signed-off-by: Gene Cumm <gene.cumm at gmail.com>


---
 extlinux/main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extlinux/main.c b/extlinux/main.c
index e5212a9..6aa6202 100755
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -112,7 +112,7 @@ static int sysfs_get_offset(int devfd, unsigned long *start)
 
     if ((size_t)snprintf(sysfs_name, sizeof sysfs_name,
 			 "/sys/dev/block/%u:%u/start",
-			 major(st.st_dev), minor(st.st_dev))
+			 major(st.st_rdev), minor(st.st_rdev))
 	>= sizeof sysfs_name)
 	return -1;
 
@@ -153,7 +153,7 @@ int get_geometry(int devfd, uint64_t totalbytes, struct hd_geometry *geo)
 
     memset(geo, 0, sizeof *geo);
 
-    if (!ioctl(devfd, HDIO_GETGEO, &geo)) {
+    if (!ioctl(devfd, HDIO_GETGEO, geo)) {
 	goto ok;
     } else if (!ioctl(devfd, FDGETPRM, &fd_str)) {
 	geo->heads = fd_str.head;