xfsprogs: replace ftruncate64 by equivalent ftruncate

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

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index ff279c336e9cb8bccc2329221929212fd7fbcf86..cad38114cf6c4adb393cd01735ceca70f803b24d 100644 (file)
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -834,7 +834,7 @@ main(int argc, char **argv)
                if (write_last_block)  {
                        /* ensure regular files are correctly sized */
 
-                       if (ftruncate64(target[i].fd, mp->m_sb.sb_dblocks *
+                       if (ftruncate(target[i].fd, mp->m_sb.sb_dblocks *
                                                source_blocksize))  {
                                do_log(_("%s:  cannot grow data section.\n"),
                                        progname);

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 36e07057151892395f5453f91d3cede89e6f6148..d87d02060ab6d0d7a7991d6886d88c0c988eacf5 100644 (file)
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -1451,7 +1451,7 @@ packfile(char *fname, char *tname, int fd,
                        }
                }
        }
-       if (ftruncate64(tfd, statp->bs_size) < 0) {
+       if (ftruncate(tfd, statp->bs_size) < 0) {
                fsrprintf(_("could not truncate tmpfile: %s : %s\n"),
                                fname, strerror(errno));
                goto out;

diff --git a/include/darwin.h b/include/darwin.h
index df5fbd8b7787c42d0104b14d577e07005df724b6..063f6fb446b2f027df21b07a5739a0e98c139af1 100644 (file)
--- a/include/darwin.h
+++ b/include/darwin.h
@@ -145,7 +145,6 @@ typedef __u32               xfs_nlink_t;
 #define lseek64                lseek
 #define pread64                pread
 #define pwrite64       pwrite
-#define ftruncate64    ftruncate
 #define fdatasync      fsync
 #define memalign(a,sz) valloc(sz)
 

diff --git a/include/freebsd.h b/include/freebsd.h
index 0f894e3601b4783765358d58ecb98a2c364e0f99..8029802b9dced19b1868fb6b79aac6dbd8cee502 100644 (file)
--- a/include/freebsd.h
+++ b/include/freebsd.h
@@ -34,7 +34,6 @@
 #define __LITTLE_ENDIAN        LITTLE_ENDIAN
 
 /* FreeBSD file API is 64-bit aware */
-#define ftruncate64    ftruncate
 #define lseek64                lseek
 #define pwrite64       pwrite
 #define pread64                pread

diff --git a/io/copy_file_range.c b/io/copy_file_range.c
index 7ba42b63b2460e275c761e5faa419aa8ea792177..88203e967df4e63bbecb1c5928848d050c54564b 100644 (file)
--- a/io/copy_file_range.c
+++ b/io/copy_file_range.c
@@ -72,9 +72,9 @@ copy_src_filesize(int fd)
 static int
 copy_dst_truncate(void)
 {
-       int ret = ftruncate64(file->fd, 0);
+       int ret = ftruncate(file->fd, 0);
        if (ret < 0)
-               perror("ftruncate64");
+               perror("ftruncate");
        return ret;
 }
 

diff --git a/io/truncate.c b/io/truncate.c
index f2df16834c723d3d7850d5095e7a2a8a74bdd6aa..20bada82c4aa8b0becec5852b1d2f6dde0274a96 100644 (file)
--- a/io/truncate.c
+++ b/io/truncate.c
@@ -38,7 +38,7 @@ truncate_f(
                return 0;
        }
 
-       if (ftruncate64(file->fd, offset) < 0) {
+       if (ftruncate(file->fd, offset) < 0) {
                perror("ftruncate");
                return 0;
        }

diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 26d61ebbe43d631d64524fbbb418c035e938a730..1540dcdf7b7e07c5896df36a5012d28abb0a105a 100644 (file)
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -124,7 +124,7 @@ perform_restore(
        if (is_target_file)  {
                /* ensure regular files are correctly sized */
 
-               if (ftruncate64(dst_fd, sb.sb_dblocks * sb.sb_blocksize))
+               if (ftruncate(dst_fd, sb.sb_dblocks * sb.sb_blocksize))
                        fatal("cannot set filesystem image size: %s\n",
                                strerror(errno));
        } else  {

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 8f73a42d8f443677ffccfd98b0d84db3f2040c06..ad1400fd06b89b2839e1030acf28532fc1a59c48 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2871,7 +2871,7 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
         * code will succeed.
         */
        if (xi.disfile && xi.dsize * xi.dbsize < dblocks * blocksize) {
-               if (ftruncate64(xi.dfd, dblocks * blocksize) < 0) {
+               if (ftruncate(xi.dfd, dblocks * blocksize) < 0) {
                        fprintf(stderr,
                                _("%s: Growing the data section failed\n"),
                                progname);