[xfsprogs,08/14] replace pread64 by equivalent pread

Commit Message

Felix Janda Aug. 6, 2016, 10:45 a.m. UTC

Signed-off-by: Felix Janda <[e-mail]>
---
 include/darwin.h  |  1 -
 include/freebsd.h |  1 -
 io/pread.c        | 10 +++++-----
 libxfs/rdwr.c     |  2 +-
 repair/prefetch.c |  2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

Comments

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

Looks fine,

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

Patch

diff --git a/include/darwin.h b/include/darwin.h
index 850d733..f4dbd9f 100644
--- a/include/darwin.h
+++ b/include/darwin.h
@@ -141,7 +141,6 @@  typedef u_int64_t	xfs_ino_t;
 typedef u_int32_t	xfs_dev_t;
 typedef int64_t		xfs_daddr_t;
 
-#define pread64		pread
 #define pwrite64	pwrite
 #define fdatasync	fsync
 #define memalign(a,sz)	valloc(sz)
diff --git a/include/freebsd.h b/include/freebsd.h
index 784e287..041dafe 100644
--- a/include/freebsd.h
+++ b/include/freebsd.h
@@ -35,7 +35,6 @@ 
 
 /* FreeBSD file API is 64-bit aware */
 #define pwrite64	pwrite
-#define pread64		pread
 #define fdatasync	fsync
 #define memalign(a,sz)	valloc(sz)
 
diff --git a/io/pread.c b/io/pread.c
index cafead0..3395503 100644
--- a/io/pread.c
+++ b/io/pread.c
@@ -214,7 +214,7 @@  do_pread(
 	ssize_t		buffer_size)
 {
 	if (!vectors)
-		return pread64(fd, buffer, min(count, buffer_size), offset);
+		return pread(fd, buffer, min(count, buffer_size), offset);
 
 	return do_preadv(fd, offset, count, buffer_size);
 }
@@ -254,7 +254,7 @@  read_random(
 		if (bytes == 0)
 			break;
 		if (bytes < 0) {
-			perror("pread64");
+			perror("pread");
 			return -1;
 		}
 		ops++;
@@ -296,7 +296,7 @@  read_backward(
 		if (bytes == 0)
 			return ops;
 		if (bytes < 0) {
-			perror("pread64");
+			perror("pread");
 			return -1;
 		}
 		ops++;
@@ -314,7 +314,7 @@  read_backward(
 		if (bytes == 0)
 			break;
 		if (bytes < 0) {
-			perror("pread64");
+			perror("pread");
 			return -1;
 		}
 		ops++;
@@ -345,7 +345,7 @@  read_forward(
 		if (bytes == 0)
 			break;
 		if (bytes < 0) {
-			perror("pread64");
+			perror("pread");
 			return -1;
 		}
 		ops++;
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index cb74b3c..36c39d9 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -915,7 +915,7 @@  __read_buf(int fd, void *buf, int len, off64_t offset, int flags)
 {
 	int	sts;
 
-	sts = pread64(fd, buf, len, offset);
+	sts = pread(fd, buf, len, offset);
 	if (sts < 0) {
 		int error = errno;
 		fprintf(stderr, _("%s: read failed: %s\n"),
diff --git a/repair/prefetch.c b/repair/prefetch.c
index b4f20d9..175594c 100644
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -565,7 +565,7 @@  pf_batch_read(
 		/*
 		 * now read the data and put into the xfs_but_t's
 		 */
-		len = pread64(mp_fd, buf, (int)(last_off - first_off), first_off);
+		len = pread(mp_fd, buf, (int)(last_off - first_off), first_off);
 
 		/*
 		 * Check the last buffer on the list to see if we need to