From 09d38d96fcccd6c42ab3be1ad627094d25a995c3 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Tue, 1 Nov 2016 12:38:40 +1100 Subject: [PATCH] xfsprogs: replace statvfs64 by equivalent statvfs Signed-off-by: Felix Janda Reviewed-by: Christoph Hellwig Signed-off-by: Dave Chinner --- fsr/xfs_fsr.c | 8 ++++---- include/darwin.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index 9cffa1bf8..517b75f0d 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -89,7 +89,7 @@ static void fsrallfs(char *mtab, int howlong, char *leftofffile); static void fsrall_cleanup(int timeout); static int getnextents(int); int xfsrtextsize(int fd); -int xfs_getrt(int fd, struct statvfs64 *sfbp); +int xfs_getrt(int fd, struct statvfs *sfbp); char * gettmpname(char *fname); char * getparent(char *fname); int fsrprintf(const char *fmt, ...); @@ -888,7 +888,7 @@ fsrfile_common( xfs_bstat_t *statp) { int error; - struct statvfs64 vfss; + struct statvfs vfss; struct fsxattr fsx; unsigned long bsize; @@ -940,7 +940,7 @@ fsrfile_common( * Note that xfs_bstat.bs_blksize returns the filesystem blocksize, * not the optimal I/O size as struct stat. */ - if (statvfs64(fsname ? fsname : fname, &vfss) < 0) { + if (statvfs(fsname ? fsname : fname, &vfss) < 0) { fsrprintf(_("unable to get fs stat on %s: %s\n"), fname, strerror(errno)); return -1; @@ -1700,7 +1700,7 @@ xfs_getgeom(int fd, xfs_fsop_geom_v1_t * fsgeom) * Get xfs realtime space information */ int -xfs_getrt(int fd, struct statvfs64 *sfbp) +xfs_getrt(int fd, struct statvfs *sfbp) { unsigned long bsize; unsigned long factor; diff --git a/include/darwin.h b/include/darwin.h index ad07346cc..8a2f67c35 100644 --- a/include/darwin.h +++ b/include/darwin.h @@ -217,7 +217,6 @@ static inline int timer_gettime (timer_t timerid, struct itimerspec *value) # include #include #include -#define statvfs64 statfs #define _PATH_MOUNTED "/etc/mtab" struct mntent -- 2.47.3