]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
fsr: remove workaround for statvfs on Mac OS X
authorFelix Janda <felix.janda@posteo.de>
Tue, 1 Nov 2016 01:38:39 +0000 (12:38 +1100)
committerDave Chinner <david@fromorbit.com>
Tue, 1 Nov 2016 01:38:39 +0000 (12:38 +1100)
It can be removed since fsr is no longer built on Mac OS X.

Signed-off-by: Felix Janda <felix.janda@posteo.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fsr/xfs_fsr.c

index 98390e7065b7494f4d358950c693f5f36ae175b8..9cffa1bf889326f6ba2e9835b2f1b3082af8f45c 100644 (file)
@@ -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;