Fix xvm stripe detection in libdisk - pass correctly

sized structures to xvm ioctls.
Bump version

diff --git a/VERSION b/VERSION
index 370cc02c4efd211c190a7d8cfed9d7b4c17dba09..4b2646d6bca032df4cca75027a6b70113affe4db 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=5
-PKG_REVISION=1
+PKG_REVISION=2
 PKG_BUILD=0

diff --git a/doc/CHANGES b/doc/CHANGES
index 8f9894187f43577e5795d902b49895a73598eed6..b654d821c927cae677db32528505e06cd71a7c3b 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.5.2 (25 June 2003)
+       - Fix xvm stripe detection in libdisk - pass correctly
+         sized structures to xvm ioctls.
+
 xfsprogs-2.5.1 (23 June 2003)
        - Fix libdisk device driver (volume managers) detection code
          used by mkfs, so that drivers with multiple majors are not

diff --git a/libdisk/xvm.h b/libdisk/xvm.h
index c4c6ded5c455fe2320dfb0e5b11528794eafa5c4..8ee0c89e370e45e3fd09fa4840e47b7af502371f 100644 (file)
--- a/libdisk/xvm.h
+++ b/libdisk/xvm.h
@@ -40,14 +40,17 @@
  * numbers.
  */
 #define XVM_GETDEV_VERS 1
+
+typedef __uint32_t xvm_dev_t;
+
 typedef struct {
        __uint32_t              version;
-       dev_t                   data_subvol_dev;
+       xvm_dev_t               data_subvol_dev;
 
-       dev_t                   log_subvol_dev;
-       dev_t                   rt_subvol_dev;
+       xvm_dev_t               log_subvol_dev;
+       xvm_dev_t               rt_subvol_dev;
 
-       dev_t                   sp_subvol_dev;
+       xvm_dev_t               sp_subvol_dev;
 } xvm_getdev_t;
 
 /*
@@ -60,5 +63,5 @@ typedef struct xvm_subvol_stripe_s {
        __uint32_t              unit_size;      /* in blocks */
        __uint32_t              width_size;     /* in blocks */
        __uint32_t              pad1;           /* padding */
-       dev_t                   dev;
+       xvm_dev_t               dev;
 } xvm_subvol_stripe_t;