From a11190428bb21015c1ab8dd793f4f006fb27cf05 Mon Sep 17 00:00:00 2001
From: Junichi Uekawa <uekawa@google.com>
Date: Mon, 13 Dec 2021 17:39:05 +0900
Subject: [PATCH] crosvm: minor change in O_DIRECT flag specification.

I could use inline if seems more elegant and in line with
https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3328602

BUG=b:190435784
BUG=b:184204645
TEST=build

Change-Id: I0d46f6f2520a7c68ae6ed748a3bc217ec83def4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3334326
Reviewed-by: Mattias Nissler <mnissler@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Junichi Uekawa <uekawa@chromium.org>
---
 common/sys_util/src/lib.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/sys_util/src/lib.rs b/common/sys_util/src/lib.rs
index bf95c43aaa..bbcd9aa839 100644
--- a/common/sys_util/src/lib.rs
+++ b/common/sys_util/src/lib.rs
@@ -608,11 +608,11 @@ pub fn open_file<P: AsRef<Path>>(path: P, read_only: bool, o_direct: bool) -> Re
     Ok(if let Some(fd) = safe_descriptor_from_path(path)? {
         fd.into()
     } else {
-        let mut options = OpenOptions::new();
-        if o_direct {
-            options.custom_flags(O_DIRECT);
-        }
-        options.write(!read_only).read(true).open(path)?
+        OpenOptions::new()
+            .custom_flags(if o_direct { O_DIRECT } else { 0 })
+            .write(!read_only)
+            .read(true)
+            .open(path)?
     })
 }