commit 35829f396827137ccfd549b4f935a0b4867a4ceb
author Jeff Sharkey <jsharkey@android.com> Fri Jan 12 20:20:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 12 20:20:15 2018 +0000
tree 88dd68f6ce5bc53b320214daef1c82ca85812135
parent b96ed7e6e04435f2e17e90d3de948ffbd58d9376
parent 9b73845fe8b546d21f3e937acae43b4eeeb0afc0

Merge "Remove FIDTRIM."

TrimTask.cpp

diff --git a/TrimTask.cpp b/TrimTask.cpp
index 08e6499..0eea715 100644
--- a/TrimTask.cpp
+++ b/TrimTask.cpp
@@ -34,9 +34,6 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 
-/* From a would-be kernel header */
-#define FIDTRIM         _IOWR('f', 128, struct fstrim_range)    /* Deep discard trim */
-
 #define BENCHMARK_ENABLED 1
 
 using android::base::StringPrintf;
@@ -127,7 +124,7 @@
         range.len = ULLONG_MAX;
 
         nsecs_t start = systemTime(SYSTEM_TIME_BOOTTIME);
-        if (ioctl(fd, (mFlags & Flags::kDeepTrim) ? FIDTRIM : FITRIM, &range)) {
+        if (ioctl(fd, FITRIM, &range)) {
             PLOG(WARNING) << "Trim failed on " << path;
             notifyResult(path, -1, -1);
         } else {