From 7f090a5775587aa9b89fd5b36b26e85857defda9 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 9 Oct 2003 23:39:38 +0000 Subject: [PATCH] Rejig block ioctl definitions in libxfs --- VERSION | 2 +- debian/changelog | 4 ++-- doc/CHANGES | 5 +++++ libxfs/linux.c | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index d4bf86663..a3d0348fa 100644 --- 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 1fa27495c..12775c4dc 100644 --- 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 Fri, 19 Sep 2003 14:15:16 +1000 + -- Nathan Scott 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 bdd09af45..6971404be 100644 --- 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 d030457ec..d4217bebf 100644 --- 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) -- 2.47.2