commit 72bc10b90458449631e65ce14d7137fbc3c27238
author Jaegeuk Kim <jaegeuk@google.com> Fri Jun 14 15:19:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 14 15:19:48 2019 -0700
tree ee0770bf10a5323d81024a61cddf694561482080
parent f7f8724c7824a7fb830137ee7b5107f644ab15f6
parent eb5c5bfd08971fe9d36c1ca6a0d3981930b2f5ef

Merge "fs_mgr_fstab: translate reserve_root to reserved_size in fsmgr" am: c47618662f
am: 394e2ad0a2

Change-Id: I7b51b1083ae666a4692b25993175f88fc489de60

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 403f9be..31790b1 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -171,6 +171,18 @@
                 fs_options.append(",");  // appends a comma if not the first
             }
             fs_options.append(flag);
+
+            if (entry->fs_type == "f2fs" && StartsWith(flag, "reserve_root=")) {
+                std::string arg;
+                if (auto equal_sign = flag.find('='); equal_sign != std::string::npos) {
+                    arg = flag.substr(equal_sign + 1);
+                }
+                if (!ParseInt(arg, &entry->reserved_size)) {
+                    LWARNING << "Warning: reserve_root= flag malformed: " << arg;
+                } else {
+                    entry->reserved_size <<= 12;
+                }
+            }
         }
     }
     entry->fs_options = std::move(fs_options);