commit 9396edfd2acd89368d9cb1545b8abe100879d2a9
author Christopher Morin <cmtm@google.com> Tue Jan 09 00:52:20 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 09 00:52:20 2018 +0000
tree ee068d9c7b8dcec102a057e9106ae3f10f973c9f
parent c16340c646b7c89f6ae40fcbf9773d0ecfa5685d
parent e8493e7045b5ce2bb8b29904729f0647b8659b98

Merge "fs_mgr: don't log error messages when missing fstab" am: ace69b2f7b
am: e8493e7045

Change-Id: Ib3aeba78f190f5107bb08adac760035ebbb4d63a

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index d913af0..1c01d8c 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -638,6 +638,7 @@
  * frees up memory of the return value without touching a and b. */
 static struct fstab *in_place_merge(struct fstab *a, struct fstab *b)
 {
+    if (!a && !b) return nullptr;
     if (!a) return b;
     if (!b) return a;
 
@@ -755,15 +756,17 @@
         default_fstab = get_fstab_path();
     }
 
-    if (default_fstab.empty()) {
-        LWARNING << __FUNCTION__ << "(): failed to find device default fstab";
+    struct fstab* fstab = nullptr;
+    if (!default_fstab.empty()) {
+        fstab = fs_mgr_read_fstab(default_fstab.c_str());
+    } else {
+        LINFO << __FUNCTION__ << "(): failed to find device default fstab";
     }
 
+    struct fstab* fstab_dt = fs_mgr_read_fstab_dt();
+
     // combines fstab entries passed in from device tree with
     // the ones found from default_fstab file
-    struct fstab *fstab_dt = fs_mgr_read_fstab_dt();
-    struct fstab *fstab = fs_mgr_read_fstab(default_fstab.c_str());
-
     return in_place_merge(fstab_dt, fstab);
 }