Rejig block ioctl definitions in libxfs

diff --git a/VERSION b/VERSION
index d4bf86663fecfd3d5966f56910cd89903781bd30..a3d0348facfcb6d0902e70d9773663914e9d845d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=5
-PKG_REVISION=10
+PKG_REVISION=11
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index 1fa27495c7906bb4c983442968a844f9b5b3908e..12775c4dcd65bd030c385be4e6ff3101b8b3f836 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xfsprogs (2.5.9-1) unstable; urgency=low
+xfsprogs (2.5.11-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Nathan Scott <nathans@debian.org>  Fri, 19 Sep 2003 14:15:16 +1000
+ -- Nathan Scott <nathans@debian.org>  Fri, 10 Oct 2003 09:37:57 +1000
 
 xfsprogs (2.5.6-1) unstable; urgency=low
 

diff --git a/doc/CHANGES b/doc/CHANGES
index bdd09af45688c0122b7d40192e73788db8925966..6971404beda31231860965fa3cba3c18e6f0a82d 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,8 @@
+xfsprogs-2.5.11 (10 October 2003)
+       - Incorporate Jan Derfinaks change to the Linux block ioctls
+         used in libxfs, allowing this code to compile cleanly with
+         include files from Linux 2.6.0-test5 onward.
+
 xfsprogs-2.5.10 (30 September 2003)
        - Fix up xfs_logprint to handle version 2 logs for its 
          operation output (previously core dumped on it).

diff --git a/libxfs/linux.c b/libxfs/linux.c
index d030457ecceda85595b39e95a586e5045e2e1f8f..d4217bebf920238e518bc3fe6bf942e54f4c169a 100644 (file)
--- a/libxfs/linux.c
+++ b/libxfs/linux.c
@@ -42,10 +42,10 @@
 extern char *progname;
 
 #ifndef BLKGETSIZE64
-# define BLKGETSIZE64  _IOR(0x12,114,sizeof(__uint64_t))
+# define BLKGETSIZE64  _IOR(0x12,114,size_t)
 #endif
 #ifndef BLKBSZSET
-# define BLKBSZSET     _IOW(0x12,113,sizeof(int))
+# define BLKBSZSET     _IOW(0x12,113,size_t)
 #endif
 #ifndef BLKSSZGET
 # define BLKSSZGET     _IO(0x12,104)