From 8ec7787252bf0a8e8f013c40dd99679c7fd57aff Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Thu, 30 Nov 2023 12:22:19 +0000
Subject: [PATCH] Revert "fixup previous commit"

This reverts commit 34e69cfc9348a2939695e86d8369e3c21e8ea9c7.
---
 pageserver/src/tenant/storage_layer/delta_layer.rs | 13 ++++++-------
 pageserver/src/tenant/storage_layer/image_layer.rs | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs
index 4d13ade5ac..dc5e9e33af 100644
--- a/pageserver/src/tenant/storage_layer/delta_layer.rs
+++ b/pageserver/src/tenant/storage_layer/delta_layer.rs
@@ -634,13 +634,12 @@ impl DeltaLayer {
     where
         F: Fn(Summary) -> Summary,
     {
-        let file = {
-            let mut options = tokio_epoll_uring::ops::open_at::OpenOptions::new();
-            options.read(true).write(true);
-            VirtualFile::open_with_options_async(path, options)
-                .await
-                .with_context(|| format!("Failed to open file '{}'", path))?
-        };
+        let file = VirtualFile::open_with_options(
+            path,
+            &*std::fs::OpenOptions::new().read(true).write(true),
+        )
+        .await
+        .with_context(|| format!("Failed to open file '{}'", path))?;
         let file = FileBlockReader::new(file);
         let summary_blk = file.read_blk(0, ctx).await?;
         let actual_summary = Summary::des_prefix(summary_blk.as_ref()).context("deserialize")?;
diff --git a/pageserver/src/tenant/storage_layer/image_layer.rs b/pageserver/src/tenant/storage_layer/image_layer.rs
index 2f0291f58e..bbe45882a9 100644
--- a/pageserver/src/tenant/storage_layer/image_layer.rs
+++ b/pageserver/src/tenant/storage_layer/image_layer.rs
@@ -319,13 +319,12 @@ impl ImageLayer {
     where
         F: Fn(Summary) -> Summary,
     {
-        let file = {
-            let mut options = tokio_epoll_uring::ops::open_at::OpenOptions::new();
-            options.read(true).write(true);
-            VirtualFile::open_with_options_async(path, options)
-                .await
-                .with_context(|| format!("Failed to open file '{}'", path))?
-        };
+        let file = VirtualFile::open_with_options(
+            path,
+            &*std::fs::OpenOptions::new().read(true).write(true),
+        )
+        .await
+        .with_context(|| format!("Failed to open file '{}'", path))?;
         let file = FileBlockReader::new(file);
         let summary_blk = file.read_blk(0, ctx).await?;
         let actual_summary = Summary::des_prefix(summary_blk.as_ref()).context("deserialize")?;