From 70c6838c9a6dff8ad9a2f6b8bee3c1c349b302d2 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Tue, 12 Dec 2023 14:59:50 +0000
Subject: [PATCH] use to_owned() when putting together OpenOptions

---
 pageserver/src/tenant/ephemeral_file.rs          | 14 +++++++++-----
 .../src/tenant/storage_layer/delta_layer.rs      | 16 +++++++++-------
 .../src/tenant/storage_layer/image_layer.rs      | 16 +++++++++-------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/pageserver/src/tenant/ephemeral_file.rs b/pageserver/src/tenant/ephemeral_file.rs
index 8834fafd5d..5c465e0655 100644
--- a/pageserver/src/tenant/ephemeral_file.rs
+++ b/pageserver/src/tenant/ephemeral_file.rs
@@ -44,11 +44,15 @@ impl EphemeralFile {
                 "ephemeral-{filename_disambiguator}"
             )));
 
-        let file = {
-            let mut options = tokio_epoll_uring::ops::open_at::OpenOptions::new();
-            options.read(true).write(true).create(true);
-            VirtualFile::open_with_options(&filename, options).await?
-        };
+        let file = VirtualFile::open_with_options(
+            &filename,
+            tokio_epoll_uring::ops::open_at::OpenOptions::new()
+                .read(true)
+                .write(true)
+                .create(true)
+                .to_owned(),
+        )
+        .await?;
 
         Ok(EphemeralFile {
             page_cache_file_id: page_cache::next_file_id(),
diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs
index 301e452a6a..869759431a 100644
--- a/pageserver/src/tenant/storage_layer/delta_layer.rs
+++ b/pageserver/src/tenant/storage_layer/delta_layer.rs
@@ -647,13 +647,15 @@ 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(path, options)
-                .await
-                .with_context(|| format!("Failed to open file '{}'", path))?
-        };
+        let file = VirtualFile::open_with_options(
+            path,
+            tokio_epoll_uring::ops::open_at::OpenOptions::new()
+                .read(true)
+                .write(true)
+                .to_owned(),
+        )
+        .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 c9ec81ced9..42127b17b0 100644
--- a/pageserver/src/tenant/storage_layer/image_layer.rs
+++ b/pageserver/src/tenant/storage_layer/image_layer.rs
@@ -325,13 +325,15 @@ 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(path, options)
-                .await
-                .with_context(|| format!("Failed to open file '{}'", path))?
-        };
+        let file = VirtualFile::open_with_options(
+            path,
+            tokio_epoll_uring::ops::open_at::OpenOptions::new()
+                .read(true)
+                .write(true)
+                .to_owned(),
+        )
+        .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")?;