On Mon, Aug 02, 2021 at 11:50:20PM +0200, Pavel Reichl wrote:
> ---
> copy/xfs_copy.c | 4 ++--
> fsr/xfs_fsr.c | 2 +-
> growfs/xfs_growfs.c | 2 +-
> include/linux.h | 9 ++-------
> io/init.c | 2 +-
> io/open.c | 4 ++--
> io/stat.c | 2 +-
> libfrog/paths.c | 2 +-
> quota/free.c | 2 +-
> spaceman/init.c | 2 +-
> 10 files changed, 13 insertions(+), 18 deletions(-)
>
> diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
> index 2a17bf38..4872621d 100644
> --- a/copy/xfs_copy.c
> +++ b/copy/xfs_copy.c
> @@ -670,7 +670,7 @@ main(int argc, char **argv)
> if (S_ISREG(statbuf.st_mode))
> source_is_file = 1;
>
> - if (source_is_file && platform_test_xfs_fd(source_fd)) {
> + if (source_is_file && test_xfs_fd(source_fd)) {
> if (fcntl(source_fd, F_SETFL, open_flags | O_DIRECT) < 0) {
> do_log(_("%s: Cannot set direct I/O flag on \"%s\".\n"),
> progname, source_name);
> @@ -869,7 +869,7 @@ main(int argc, char **argv)
> progname);
> die_perror();
> }
> - if (platform_test_xfs_fd(target[i].fd)) {
> + if (test_xfs_fd(target[i].fd)) {
> if (xfsctl(target[i].name, target[i].fd,
> XFS_IOC_DIOINFO, &d) < 0) {
> do_log(
> diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
> index 6cf8bfb7..25eb2e12 100644
> --- a/fsr/xfs_fsr.c
> +++ b/fsr/xfs_fsr.c
> @@ -248,7 +248,7 @@ main(int argc, char **argv)
> progname, argname);
> exit(1);
> } else if (S_ISDIR(sb.st_mode) || S_ISREG(sb.st_mode)) {
> - if (!platform_test_xfs_path(argname)) {
> + if (!test_xfs_path(argname)) {
> fprintf(stderr, _(
> "%s: cannot defragment: %s: Not XFS\n"),
> progname, argname);
> diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
> index d45ba703..dc01dfe8 100644
> --- a/growfs/xfs_growfs.c
> +++ b/growfs/xfs_growfs.c
> @@ -160,7 +160,7 @@ main(int argc, char **argv)
> return 1;
> }
>
> - if (!platform_test_xfs_fd(ffd)) {
> + if (!test_xfs_fd(ffd)) {
> fprintf(stderr, _("%s: specified file "
> "[\"%s\"] is not on an XFS filesystem\n"),
> progname, fname);
> diff --git a/include/linux.h b/include/linux.h
> index 9c7ea189..bef4ea00 100644
> --- a/include/linux.h
> +++ b/include/linux.h
> @@ -46,7 +46,7 @@ static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
> * so return 0 for those
> */
>
> -static __inline__ int platform_test_xfs_fd(int fd)
> +static __inline__ int test_xfs_fd(int fd)
> {
> struct statfs statfsbuf;
> struct stat statbuf;
> @@ -60,7 +60,7 @@ static __inline__ int platform_test_xfs_fd(int fd)
> return (statfsbuf.f_type == 0x58465342); /* XFSB */
> }
>
> -static __inline__ int platform_test_xfs_path(const char *path)
> +static __inline__ int test_xfs_path(const char *path)
These ship in the userspace development headers package (xfslibs-dev),
which means they're part of userspace ABI and cannot be renamed without
breaking userspace programs such as xfsdump.
--D
> {
> struct statfs statfsbuf;
> struct stat statbuf;
> @@ -74,11 +74,6 @@ static __inline__ int platform_test_xfs_path(const char *path)
> return (statfsbuf.f_type == 0x58465342); /* XFSB */
> }
>
> -static __inline__ int platform_fstatfs(int fd, struct statfs *buf)
> -{
> - return fstatfs(fd, buf);
> -}
> -
> static __inline__ void platform_getoptreset(void)
> {
> extern int optind;
> diff --git a/io/init.c b/io/init.c
> index 0fbc703e..15df0c03 100644
> --- a/io/init.c
> +++ b/io/init.c
> @@ -219,7 +219,7 @@ init(
> c = openfile(argv[optind], &geometry, flags, mode, &fsp);
> if (c < 0)
> exit(1);
> - if (!platform_test_xfs_fd(c))
> + if (!test_xfs_fd(c))
> flags |= IO_FOREIGN;
> if (addfile(argv[optind], c, &geometry, flags, &fsp) < 0)
> exit(1);
> diff --git a/io/open.c b/io/open.c
> index d8072664..498e6163 100644
> --- a/io/open.c
> +++ b/io/open.c
> @@ -115,7 +115,7 @@ openfile(
> }
> }
>
> - if (!geom || !platform_test_xfs_fd(fd))
> + if (!geom || !test_xfs_fd(fd))
> return fd;
>
> if (flags & IO_PATH) {
> @@ -326,7 +326,7 @@ open_f(
> return 0;
> }
>
> - if (!platform_test_xfs_fd(fd))
> + if (!test_xfs_fd(fd))
> flags |= IO_FOREIGN;
>
> if (addfile(argv[optind], fd, &geometry, flags, &fsp) != 0) {
> diff --git a/io/stat.c b/io/stat.c
> index 49c4c27c..78f7d7f8 100644
> --- a/io/stat.c
> +++ b/io/stat.c
> @@ -182,7 +182,7 @@ statfs_f(
> int ret;
>
> printf(_("fd.path = \"%s\"\n"), file->name);
> - if (platform_fstatfs(file->fd, &st) < 0) {
> + if (fstatfs(file->fd, &st) < 0) {
> perror("fstatfs");
> exitcode = 1;
> } else {
> diff --git a/libfrog/paths.c b/libfrog/paths.c
> index d6793764..c86f258e 100644
> --- a/libfrog/paths.c
> +++ b/libfrog/paths.c
> @@ -161,7 +161,7 @@ fs_table_insert(
> goto out_nodev;
> }
>
> - if (!platform_test_xfs_path(dir))
> + if (!test_xfs_path(dir))
> flags |= FS_FOREIGN;
>
> /*
> diff --git a/quota/free.c b/quota/free.c
> index ea9c112f..8fcb6b93 100644
> --- a/quota/free.c
> +++ b/quota/free.c
> @@ -62,7 +62,7 @@ mount_free_space_data(
> return 0;
> }
>
> - if (platform_fstatfs(fd, &st) < 0) {
> + if (fstatfs(fd, &st) < 0) {
> perror("fstatfs");
> close(fd);
> return 0;
> diff --git a/spaceman/init.c b/spaceman/init.c
> index cf1ff3cb..8ad70929 100644
> --- a/spaceman/init.c
> +++ b/spaceman/init.c
> @@ -93,7 +93,7 @@ init(
> c = openfile(argv[optind], &xfd, &fsp);
> if (c < 0)
> exit(1);
> - if (!platform_test_xfs_fd(xfd.fd))
> + if (!test_xfs_fd(xfd.fd))
> printf(_("Not an XFS filesystem!\n"));
> c = addfile(argv[optind], &xfd, &fsp);
> if (c < 0)
> --
> 2.31.1
>
