From d1def9a4b193fe31ca877d47ff882146b8e55f26 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 8 Mar 2023 10:30:16 -0500 Subject: [PATCH] linux shim: Fix dropped O_DIRECT flag A recent libbcachefs update accidentally committed a change that dropped the O_DIRECT flag - we definitely didn't want to do that. Signed-off-by: Kent Overstreet --- linux/blkdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/blkdev.c b/linux/blkdev.c index 805d55d..45b03fb 100644 --- a/linux/blkdev.c +++ b/linux/blkdev.c @@ -192,7 +192,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode, if (buffered_fd < 0) return ERR_PTR(-errno); - fd = open(path, flags); + fd = open(path, flags|O_DIRECT); if (fd < 0) fd = dup(buffered_fd); if (fd < 0) { @@ -200,7 +200,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode, return ERR_PTR(-errno); } - sync_fd = open(path, flags|O_SYNC); + sync_fd = open(path, flags|O_DIRECT|O_SYNC); if (sync_fd < 0) sync_fd = open(path, flags|O_SYNC); if (sync_fd < 0) { -- 2.39.5