From f2e846f153a093dde78913fb44010f39b5834e3f Mon Sep 17 00:00:00 2001
From: Rubin Xu <rubinxu@google.com>
Date: Thu, 21 Mar 2019 18:13:40 +0000
Subject: [PATCH] Remove excess logging in secdiscard

Remove all debug logs to reduce logspam a bit.

Bug: 64349233
Test: manual
Change-Id: I234fae7b9fb719b09af27985736f43f085dad301
---
 FileDeviceUtils.cpp | 1 -
 secdiscard.cpp      | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/FileDeviceUtils.cpp b/FileDeviceUtils.cpp
index ce938a9..c745b54 100644
--- a/FileDeviceUtils.cpp
+++ b/FileDeviceUtils.cpp
@@ -61,7 +61,6 @@ std::string BlockDeviceForPath(const std::string& path) {
         LOG(ERROR) << "Didn't find a mountpoint to match path " << path;
         return "";
     }
-    LOG(DEBUG) << "For path " << path << " block device is " << result;
     return result;
 }
 
diff --git a/secdiscard.cpp b/secdiscard.cpp
index 2d9dc35..cb2eca9 100644
--- a/secdiscard.cpp
+++ b/secdiscard.cpp
@@ -94,7 +94,6 @@ int main(int argc, const char* const argv[]) {
         }
         set = 0;
         ioctl(fd, F2FS_IOC_SET_PIN_FILE, &set);
-        LOG(DEBUG) << "Discarded: " << target;
     }
     return 0;
 }
@@ -143,9 +142,8 @@ bool secdiscard_path(const std::string& path) {
         range[0] = fiemap->fm_extents[i].fe_physical;
         range[1] = fiemap->fm_extents[i].fe_length;
         if (ioctl(fs_fd.get(), BLKSECDISCARD, range) == -1) {
-            PLOG(ERROR) << "Unable to BLKSECDISCARD " << path;
+            // Use zero overwrite as a fallback for BLKSECDISCARD
             if (!overwrite_with_zeros(fs_fd.get(), range[0], range[1])) return false;
-            LOG(DEBUG) << "Used zero overwrite";
         }
     }
     return true;