[PATCH v2 26/29] xfsprogs: Stop using platform_findblockpath()

Pavel Reichl
2021-08-06T21:24:02Z

---
libfrog/linux.c | 8 +++++++-
libfrog/platform.h | 1 +
libxfs/init.c | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libfrog/linux.c b/libfrog/linux.c
index 31ed59c9..e670a5e9 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c
@@ -282,11 +282,17 @@ platform_findrawpath(char *path)
}

char *
-platform_findblockpath(char *path)
+findblockpath(char *path)
{
return path;
}

+char *
+platform_findblockpath(char *path)
+{
+ return findblockpath(path);
+}
+
int
platform_direct_blockdev(void)
{
diff --git a/libfrog/platform.h b/libfrog/platform.h
index 832eb41a..8f1a3493 100644
--- a/libfrog/platform.h
+++ b/libfrog/platform.h
@@ -20,6 +20,7 @@ int flush_device(int fd, dev_t device);
char *platform_findrawpath(char *path);
char *findrawpath(char *path);
char *platform_findblockpath(char *path);
+char *findblockpath(char *path);
int platform_direct_blockdev(void);
int platform_align_blockdev(void);
unsigned long platform_physmem(void); /* in kilobytes */
diff --git a/libxfs/init.c b/libxfs/init.c
index d7166b69..738e2d2d 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -206,7 +206,7 @@ check_open(char *path, int flags, char **rawfile, char **blockfile)
progname, path);
return 0;
}
- if (!(*blockfile = platform_findblockpath(path))) {
+ if (!(*blockfile = findblockpath(path))) {
fprintf(stderr, _("%s: "
"can't find a block device matching %s\n"),
progname, path);
--
2.31.1