commit a20b92c0b07f5373845f99afc80254e9d9c83ea3
author Daniel Rosenberg <drosen@google.com> Thu Jan 24 20:42:34 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 24 20:42:34 2019 -0800
tree 210fd38159ee6e45ba42c5da1a42f795ef05ea09
parent 4cd21026371a32d09df0ed6f1be16bdb8bc35ffa
parent b6c1c24f864854399031729774a53ee08db61305

Merge "Preserve options on remount in commitChanges" am: aaac873faf
am: b6c1c24f86

Change-Id: I0d7963e307591612e6ab47bff27b49f8f6a1dd2f

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index e06e855..7a29514 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -129,8 +129,10 @@
 
         if (fs_mgr_is_checkpoint_fs(fstab_rec)) {
             if (!strcmp(fstab_rec->fs_type, "f2fs")) {
+                std::string options = mount_rec->fs_options;
+                options += ",checkpoint=enable";
                 if (mount(mount_rec->blk_device, mount_rec->mount_point, "none",
-                          MS_REMOUNT | fstab_rec->flags, "checkpoint=enable")) {
+                          MS_REMOUNT | fstab_rec->flags, options.c_str())) {
                     return Status::fromExceptionCode(EINVAL, "Failed to remount");
                 }
             }