xfs
[Top] [All Lists]

[PATCHv2 xfsprogs 11/14] fsr: remove workaround for statvfs on Mac OS X

To: xfs@xxxxxxxxxxx
Subject: [PATCHv2 xfsprogs 11/14] fsr: remove workaround for statvfs on Mac OS X
From: Felix Janda <felix.janda@xxxxxxxxx>
Date: Sat, 13 Aug 2016 18:20:47 +0200
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <cover.1471107858.git.felix.janda@xxxxxxxxx>
References: <cover.1471107858.git.felix.janda@xxxxxxxxx>
Resent-date: Sat, 13 Aug 2016 19:24:56 +0200
Resent-from: Felix Janda <felix.janda@xxxxxxxxx>
Resent-message-id: <20160813172456.GI3858@nyan>
Resent-to: xfs@xxxxxxxxxxx
It can be removed since fsr is no longer built on Mac OS X.

Signed-off-by: Felix Janda <felix.janda@xxxxxxxxx>
---
 fsr/xfs_fsr.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 98390e7..9cffa1b 100644
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -945,11 +945,7 @@ fsrfile_common(
                        fname, strerror(errno));
                return -1;
        }
-#ifndef statvfs64
        bsize = vfss.f_frsize ? vfss.f_frsize : vfss.f_bsize;
-#else
-       bsize = vfss.f_bsize;
-#endif
        if (statp->bs_blksize * statp->bs_blocks >
            vfss.f_bfree * bsize - minimumfree) {
                fsrprintf(_("insufficient freespace for: %s: "
@@ -1717,11 +1713,7 @@ xfs_getrt(int fd, struct statvfs64 *sfbp)
                close(fd);
                return -1;
        }
-#ifndef statvfs64
        bsize = (sfbp->f_frsize ? sfbp->f_frsize : sfbp->f_bsize);
-#else
-       bsize = sfbp->f_bsize;
-#endif
        factor = fsgeom.blocksize / bsize;         /* currently this is == 1 */
        sfbp->f_bfree = (cnt.freertx * fsgeom.rtextsize) * factor;
        return 0;
-- 
2.7.3

<Prev in Thread] Current Thread [Next in Thread>