From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Wed, 8 Mar 2023 15:30:16 +0000 (-0500)
Subject: linux shim: Fix dropped O_DIRECT flag
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d1def9a4b193fe31ca877d47ff882146b8e55f26;p=bcachefs-tools-debian

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 <kent.overstreet@linux.dev>
---

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) {