[PATCH v2 02/29] xfsprogs: Stop using platform_test_xfs_fd()

Pavel Reichl
2021-08-06T21:23:28Z

---
copy/xfs_copy.c | 4 ++--
growfs/xfs_growfs.c | 2 +-
include/linux.h | 7 ++++++-
io/init.c | 2 +-
io/open.c | 4 ++--
spaceman/init.c | 2 +-
6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 841ab7e4..a7cbae02 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/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 a22f7812..f48ec823 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,6 +60,11 @@ static __inline__ int platform_test_xfs_fd(int fd)
return (statfsbuf.f_type == 0x58465342); /* XFSB */
}

+static __inline__ int platform_test_xfs_fd(int fd)
+{
+ return test_xfs_fd(fd);
+}
+
static __inline__ int platform_test_xfs_path(const char *path)
{
struct statfs statfsbuf;
diff --git a/io/init.c b/io/init.c
index 033ed67d..bd31b474 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/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