commit e0bb1fcb72a21998256144b1e8db8254fa8d81ac
author Tom Cherry <tomcherry@google.com> Mon Dec 03 15:18:00 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 03 15:18:00 2018 -0800
tree a7b233c8a058b57dc17daaac595e71cc6f6f2e73
parent 0c2e9f1dbea02f47f3bb3fa24e40f712c2c3d7b3
parent 0253a9fc98126ba31d3ad6f2a5942b5141b6aaba

Merge "fs_mgr fix flags/fs_mgr_flags mismatch" am: 5d595da516 am: 3ead1ef31e
am: 21dee849f8

Change-Id: I53cf4399564c22afacd4c6f47ee1e77498d4a39a

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 93c33bb..6f863ad 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1047,7 +1047,7 @@
         /* Skip mounting the root partition, as it will already have been mounted */
         if (!strcmp(fstab->recs[i].mount_point, "/") ||
             !strcmp(fstab->recs[i].mount_point, "/system")) {
-            if ((fstab->recs[i].fs_mgr_flags & MS_RDONLY) != 0) {
+            if ((fstab->recs[i].flags & MS_RDONLY) != 0) {
                 fs_mgr_set_blk_ro(fstab->recs[i].blk_device);
             }
             continue;