[PATCH v2 28/29] xfsprogs: Stop using platform_align_blockdev()
From: Pavel Reichl <hidden>
Date: 2021-08-06 21:24:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- 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 59edc260..43ca1e7d 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c@@ -305,13 +305,19 @@ int platform_direct_blockdev() } int -platform_align_blockdev(void) +align_blockdev(void) { if (!max_block_alignment) return getpagesize(); return max_block_alignment; } +int +platform_align_blockdev(void) +{ + return align_blockdev(); +} + /* How many CPUs are online? */ int nproc(void)
diff --git a/libfrog/platform.h b/libfrog/platform.h
index ec1a5ab7..42b0d753 100644
--- a/libfrog/platform.h
+++ b/libfrog/platform.h@@ -24,6 +24,7 @@ char *findblockpath(char *path); int platform_direct_blockdev(void); int direct_blockdev(void); int platform_align_blockdev(void); +int align_blockdev(void); unsigned long platform_physmem(void); /* in kilobytes */ void platform_findsizes(char *path, int fd, long long *sz, int *bsz); void findsizes(char *path, int fd, long long *sz, int *bsz);
diff --git a/libxfs/init.c b/libxfs/init.c
index e412fd6e..a9b67159 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c@@ -1030,7 +1030,7 @@ libxfs_destroy( int libxfs_device_alignment(void) { - return platform_align_blockdev(); + return align_blockdev(); } void
--
2.31.1