[PATCH v2 27/29] xfsprogs: Stop using platform_direct_blockdev()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

diff --git a/libfrog/linux.c b/libfrog/linux.c
index e670a5e9..59edc260 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c
@@ -294,11 +294,16 @@ platform_findblockpath(char *path)
 }
 
 int
-platform_direct_blockdev(void)
+direct_blockdev(void)
 {
 	return 1;
 }
 
+int platform_direct_blockdev()
+{
+	return direct_blockdev();
+}
+
 int
 platform_align_blockdev(void)
 {
diff --git a/libfrog/platform.h b/libfrog/platform.h
index 8f1a3493..ec1a5ab7 100644
--- a/libfrog/platform.h
+++ b/libfrog/platform.h
@@ -22,6 +22,7 @@ char *findrawpath(char *path);
 char *platform_findblockpath(char *path);
 char *findblockpath(char *path);
 int platform_direct_blockdev(void);
+int direct_blockdev(void);
 int platform_align_blockdev(void);
 unsigned long platform_physmem(void);	/* in kilobytes */
 void platform_findsizes(char *path, int fd, long long *sz, int *bsz);
diff --git a/libxfs/init.c b/libxfs/init.c
index 738e2d2d..e412fd6e 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -98,7 +98,7 @@ libxfs_device_open(char *path, int creat, int xflags, int setblksize)
 
 	readonly = (xflags & LIBXFS_ISREADONLY);
 	excl = (xflags & LIBXFS_EXCLUSIVELY) && !creat;
-	dio = (xflags & LIBXFS_DIRECT) && !creat && platform_direct_blockdev();
+	dio = (xflags & LIBXFS_DIRECT) && !creat && direct_blockdev();
 
 retry:
 	flags = (readonly ? O_RDONLY : O_RDWR) | \
-- 
2.31.1




[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]


  Powered by Linux