commit 48931daf8505291a95efe8a189618e9607b99e7e
author Eric Biggers <ebiggers@google.com> Mon Aug 05 19:11:24 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 05 19:11:24 2024 +0000
tree a3158dad4650932384424bfead8085e19d308cc7
parent ccb950f9ed337591eec54aec531ee9a32f3f771f
parent d60a2aa19937bacd1a1374d7b26b52078293a334

Merge "fs_mgr: Remove deprecated mount option" into main

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 710eb18..3e70f79 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -216,10 +216,6 @@
          */
         if (!(*fs_stat & FS_STAT_FULL_MOUNT_FAILED)) {  // already tried if full mount failed
             errno = 0;
-            if (fs_type == "ext4") {
-                // This option is only valid with ext4
-                tmpmnt_opts += ",nomblk_io_submit";
-            }
             ret = mount(blk_device.c_str(), target.c_str(), fs_type.c_str(), tmpmnt_flags,
                         tmpmnt_opts.c_str());
             PINFO << __FUNCTION__ << "(): mount(" << blk_device << "," << target << "," << fs_type