[PATCH v2 25/29] xfsprogs: Stop using platform_findrawpath()

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

---
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 796fb890..31ed59c9 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c
@@ -270,11 +270,17 @@ platform_findsizes(char *path, int fd, long long *sz, int *bsz)
}

char *
-platform_findrawpath(char *path)
+findrawpath(char *path)
{
return path;
}

+char *
+platform_findrawpath(char *path)
+{
+ return findrawpath(path);
+}
+
char *
platform_findblockpath(char *path)
{
diff --git a/libfrog/platform.h b/libfrog/platform.h
index 06519a0c..832eb41a 100644
--- a/libfrog/platform.h
+++ b/libfrog/platform.h
@@ -18,6 +18,7 @@ int set_blocksize(int fd, char *path, dev_t device, int bsz, int fatal);
int platform_flush_device(int fd, dev_t device);
int flush_device(int fd, dev_t device);
char *platform_findrawpath(char *path);
+char *findrawpath(char *path);
char *platform_findblockpath(char *path);
int platform_direct_blockdev(void);
int platform_align_blockdev(void);
diff --git a/libxfs/init.c b/libxfs/init.c
index 46e6e225..d7166b69 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -200,7 +200,7 @@ check_open(char *path, int flags, char **rawfile, char **blockfile)
perror(path);
return 0;
}
- if (!(*rawfile = platform_findrawpath(path))) {
+ if (!(*rawfile = findrawpath(path))) {
fprintf(stderr, _("%s: "
"can't find a character device matching %s\n"),
progname, path);
--
2.31.1