Patchwork block/raw-posix: get right partition size

login
register
mail settings
Submitter Christoph Egger
Date May 23, 2011, 12:31 p.m.
Message ID <4DDA5395.6070007@amd.com>
Download mbox | patch
Permalink /patch/96941/
State New
Headers show

Comments

Christoph Egger - May 23, 2011, 12:31 p.m.
use the correct way to get the size of a disk device or partition

From: Adam Hamsik <haad@netbsd.org>
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Kevin Wolf - May 25, 2011, 1:50 p.m.
Am 23.05.2011 14:31, schrieb Christoph Egger:
> 
> use the correct way to get the size of a disk device or partition
> 
> From: Adam Hamsik <haad@netbsd.org>
> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 6b72470..d05f373 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -64,6 +64,13 @@ 
  #include <sys/dkio.h>
  #endif

+#ifdef __NetBSD__
+#include <sys/ioctl.h>
+#include <sys/disklabel.h>
+#include <sys/dkio.h>
+#include <sys/disk.h>
+#endif
+
  #ifdef __DragonFly__
  #include <sys/ioctl.h>
  #include <sys/diskslice.h>
@@ -622,6 +663,31 @@  static int64_t raw_getlength(BlockDriverState *bs)
      } else
          return st.st_size;
  }
+#elif defined(__NetBSD__)
+static int64_t raw_getlength(BlockDriverState *bs)
+{
+    BDRVRawState *s = bs->opaque;
+    int fd = s->fd;
+    struct stat st;
+
+    if (fstat(fd, &st))
+        return -1;
+    if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
+        struct dkwedge_info dkw;
+
+        if (ioctl(fd, DIOCGWEDGEINFO, &dkw) != -1) {
+            return dkw.dkw_size * 512;
+        } else {
+            struct disklabel dl;
+
+            if (ioctl(fd, DIOCGDINFO, &dl))
+                return -1;
+            return (uint64_t)dl.d_secsize *
+                dl.d_partitions[DISKPART(st.st_rdev)].p_size;
+        }
+    } else
+        return st.st_size;
+}
  #elif defined(__sun__)
  static int64_t raw_getlength(BlockDriverState *bs)
  {