commit 5b4f31125e1e53d359db086a3bf0857564675cdc
author Rubin Xu <rubinxu@google.com> Fri Mar 22 06:27:47 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 22 06:27:47 2019 -0700
tree 1bf2d00d56324ad56fc4f4a01f480e690f2140a7
parent 149ed5fb3c03ddfd5afce76586e05753228136f2
parent b970f6291337a06b8255d3407d561672f415cbbd

Merge "Remove excess logging in secdiscard" am: b640f4e337 am: 2c1e98d69f
am: b970f62913

Change-Id: Icce53ecc1e43945cd1298edbf3e70005340432d9

FileDeviceUtils.cpp

diff --git a/FileDeviceUtils.cpp b/FileDeviceUtils.cpp
index ce938a9..c745b54 100644
--- a/FileDeviceUtils.cpp
+++ b/FileDeviceUtils.cpp
@@ -61,7 +61,6 @@
         LOG(ERROR) << "Didn't find a mountpoint to match path " << path;
         return "";
     }
-    LOG(DEBUG) << "For path " << path << " block device is " << result;
     return result;
 }
 

secdiscard.cpp

diff --git a/secdiscard.cpp b/secdiscard.cpp
index 2d9dc35..cb2eca9 100644
--- a/secdiscard.cpp
+++ b/secdiscard.cpp
@@ -94,7 +94,6 @@
         }
         set = 0;
         ioctl(fd, F2FS_IOC_SET_PIN_FILE, &set);
-        LOG(DEBUG) << "Discarded: " << target;
     }
     return 0;
 }
@@ -143,9 +142,8 @@
         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;