From 5db064cc4c01dbaed6776b2f68e2c2056c7e09b3 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Fri, 23 Sep 2022 10:55:02 +0800
Subject: [PATCH] dump f2fs in gs-common

Bug: 248143736
Test: adb bugreport
Change-Id: I25d95dcfc8ea906e7064c966be05cc98acc29819
---
 device.mk               | 3 +++
 dumpstate/Dumpstate.cpp | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/device.mk b/device.mk
index 527021d1..4df03f72 100644
--- a/device.mk
+++ b/device.mk
@@ -570,6 +570,9 @@ PRODUCT_PACKAGES_DEBUG += \
 	f2fs.fibmap \
 	dump.f2fs
 
+# Storage dump
+include device/google/gs-common/storage/storage.mk
+
 # Storage health HAL
 PRODUCT_PACKAGES += \
 	android.hardware.health.storage-service.default
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 4aabaf3d..01aefdd1 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -956,13 +956,6 @@ void Dumpstate::dumpMemorySection(int fd) {
                        "done"});
 }
 
-static void DumpF2FS(int fd) {
-    DumpFileToFd(fd, "F2FS", "/sys/kernel/debug/f2fs/status");
-    DumpFileToFd(fd, "F2FS", "/dev/fscklogs/fsck");
-    RunCommandToFd(fd, "F2FS - fsck time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.fsck.data"});
-    RunCommandToFd(fd, "F2FS - checkpoint=disable time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.mount.data"});
-}
-
 static void DumpUFS(int fd) {
     DumpFileToFd(fd, "UFS model", "/sys/block/sda/device/model");
     DumpFileToFd(fd, "UFS rev", "/sys/block/sda/device/rev");
@@ -1016,7 +1009,6 @@ static void DumpUFS(int fd) {
 
 // Dump items related to storage
 void Dumpstate::dumpStorageSection(int fd) {
-    DumpF2FS(fd);
     DumpUFS(fd);
 }