From 062eb59a83fe62fd5701958e7fe433b8768d66d6 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Wed, 29 May 2024 23:26:16 +0000
Subject: [PATCH] Revert "Set ro.fstype.data when /data is mounted"

Revert submission 3095293-fstype

Reason for revert: breaks build cf_x86_64_only_phone-next-userdebug

Reverted changes: /q/submissionid:3095293-fstype

Change-Id: I2d1b2561ec7a3d8ea954b375153dce1a936d0294
---
 fs_mgr/fs_mgr.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 7f41cea83..835a3e7f6 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1656,19 +1656,6 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) {
             continue;
         }
     }
-    if (userdata_mounted) {
-        Fstab mounted_fstab;
-        if (!ReadFstabFromFile("/proc/mounts", &mounted_fstab)) {
-            LOG(ERROR) << "Could't load fstab from /proc/mounts , unable to set ro.fstype.data . "
-                          "init.rc actions depending on this prop would not run, boot might fail.";
-        } else {
-            for (const auto& entry : mounted_fstab) {
-                if (entry.mount_point == "/data") {
-                    android::base::SetProperty("ro.fstype.data", entry.fs_type);
-                }
-            }
-        }
-    }
 
     set_type_property(encryptable);