[PATCH v2 13/29] xfsprogs: Stop using platform_check_ismounted()

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

---
copy/xfs_copy.c | 6 +++---
libfrog/linux.c | 8 +++++++-
libfrog/platform.h | 1 +
libxfs/init.c | 4 ++--
mdrestore/xfs_mdrestore.c | 4 ++--
5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 5f8b5c57..f864bc31 100644
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -17,7 +17,7 @@
#define rounddown(x, y) (((x)/(y))*(y))
#define uuid_equal(s,d) (uuid_compare((*s),(*d)) == 0)

-extern int platform_check_ismounted(char *, char *, struct stat *, int);
+extern int check_ismounted(char *, char *, struct stat *, int);

static char *logfile_name;
static FILE *logerr;
@@ -698,7 +698,7 @@ main(int argc, char **argv)
* check to make sure a filesystem isn't mounted
* on the device
*/
- if (platform_check_ismounted(source_name, NULL, &statbuf, 0)) {
+ if (check_ismounted(source_name, NULL, &statbuf, 0)) {
do_log(
_("%s: Warning -- a filesystem is mounted on the source device.\n"),
progname);
@@ -842,7 +842,7 @@ main(int argc, char **argv)
* check to make sure a filesystem isn't mounted
* on the device
*/
- if (platform_check_ismounted(target[i].name,
+ if (check_ismounted(target[i].name,
NULL, &statbuf, 0)) {
do_log(_("%s: a filesystem is mounted "
"on target device \"%s\".\n"
diff --git a/libfrog/linux.c b/libfrog/linux.c
index f7fac2c8..6a933b85 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c
@@ -114,7 +114,7 @@ platform_check_mount(char *name, char *block, struct stat *s, int flags)
}

int
-platform_check_ismounted(char *name, char *block, struct stat *s, int verbose)
+check_ismounted(char *name, char *block, struct stat *s, int verbose)
{
int flags;

@@ -122,6 +122,12 @@ platform_check_ismounted(char *name, char *block, struct stat *s, int verbose)
return check_mount(name, block, s, flags);
}

+int
+platform_check_ismounted(char *name, char *block, struct stat *s, int verbose)
+{
+ return check_ismounted(name, block, s, verbose);
+}
+
int
platform_check_iswritable(char *name, char *block, struct stat *s)
{
diff --git a/libfrog/platform.h b/libfrog/platform.h
index 0aef318a..8a38aa45 100644
--- a/libfrog/platform.h
+++ b/libfrog/platform.h
@@ -9,6 +9,7 @@

int platform_check_ismounted(char *path, char *block, struct stat *sptr,
int verbose);
+int check_ismounted(char *path, char *block, struct stat *sptr, int verbose);
int platform_check_iswritable(char *path, char *block, struct stat *sptr);
int platform_set_blocksize(int fd, char *path, dev_t device, int bsz,
int fatal);
diff --git a/libxfs/init.c b/libxfs/init.c
index 1ec83791..0d833ab6 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -59,7 +59,7 @@ check_isactive(char *name, char *block, int fatal)
return 0;
if ((st.st_mode & S_IFMT) != S_IFBLK)
return 0;
- if (platform_check_ismounted(name, block, &st, 0) == 0)
+ if (check_ismounted(name, block, &st, 0) == 0)
return 0;
if (platform_check_iswritable(name, block, &st))
return fatal ? 1 : 0;
@@ -212,7 +212,7 @@ check_open(char *path, int flags, char **rawfile, char **blockfile)
progname, path);
return 0;
}
- if (!readonly && !inactive && platform_check_ismounted(path, *blockfile, NULL, 1))
+ if (!readonly && !inactive && check_ismounted(path, *blockfile, NULL, 1))
return 0;

if (inactive && check_isactive(path, *blockfile, ((readonly|dangerously)?1:0)))
diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 1cd399db..4a894f3b 100644
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -182,7 +182,7 @@ usage(void)
exit(1);
}

-extern int platform_check_ismounted(char *, char *, struct stat *, int);
+extern int check_ismounted(char *, char *, struct stat *, int);

int
main(
@@ -275,7 +275,7 @@ main(
/*
* check to make sure a filesystem isn't mounted on the device
*/
- if (platform_check_ismounted(argv[optind], NULL, &statbuf, 0))
+ if (check_ismounted(argv[optind], NULL, &statbuf, 0))
fatal("a filesystem is mounted on target device \"%s\","
" cannot restore to a mounted filesystem.\n",
argv[optind]);
--
2.31.1