[xfsprogs,14/14] platform: remove use of off64_t

Commit Message

Felix Janda Aug. 7, 2016, 5:52 a.m. UTC

Since we force transparent LFS for downstreams, it can be replaced
by off_t.

Signed-off-by: Felix Janda <[e-mail]>
---
 include/darwin.h  | 1 -
 include/freebsd.h | 1 -
 include/irix.h    | 2 +-
 include/linux.h   | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

Comments

Christoph Hellwig Aug. 9, 2016, 7:41 a.m. UTC | #1

Looks fine,

Reviewed-by: Christoph Hellwig <[e-mail]>

Patch

diff --git a/include/darwin.h b/include/darwin.h
index bd1a112..1f3f789 100644
--- a/include/darwin.h
+++ b/include/darwin.h
@@ -134,7 +134,6 @@  typedef signed long long int	__s64;
 #define __uint16_t	u_int16_t
 #define __uint32_t	u_int32_t
 #define __uint64_t	u_int64_t
-#define off64_t		off_t
 
 typedef off_t		xfs_off_t;
 typedef u_int64_t	xfs_ino_t;
diff --git a/include/freebsd.h b/include/freebsd.h
index df924ef..93a9204 100644
--- a/include/freebsd.h
+++ b/include/freebsd.h
@@ -41,7 +41,6 @@ 
 #define EFSBADCRC	991	/* Bad CRC detected */
 
 typedef off_t		xfs_off_t;
-typedef off_t		off64_t;
 typedef __uint64_t	xfs_ino_t;
 typedef __uint32_t	xfs_dev_t;
 typedef __int64_t	xfs_daddr_t;
diff --git a/include/irix.h b/include/irix.h
index b92e01b..a212505 100644
--- a/include/irix.h
+++ b/include/irix.h
@@ -43,7 +43,7 @@ 
 #define __int16_t	short
 #define __uint8_t	unsigned char
 #define __uint16_t	unsigned short
-typedef off64_t		xfs_off_t;
+typedef off_t		xfs_off_t;
 typedef __int64_t	xfs_ino_t;
 typedef __int32_t	xfs_dev_t;
 typedef __int64_t	xfs_daddr_t;
diff --git a/include/linux.h b/include/linux.h
index 5614719..ed388ea 100644
--- a/include/linux.h
+++ b/include/linux.h
@@ -137,7 +137,7 @@  platform_discard_blocks(int fd, uint64_t start, uint64_t len)
 #define EFSCORRUPTED	EUCLEAN	/* Filesystem is corrupted */
 #define EFSBADCRC	EBADMSG	/* Bad CRC detected */
 
-typedef off64_t		xfs_off_t;
+typedef off_t		xfs_off_t;
 typedef __uint64_t	xfs_ino_t;
 typedef __uint32_t	xfs_dev_t;
 typedef __int64_t	xfs_daddr_t;