commit d4f07978c5c9351b767b1a718c161053d51f45ff
author Amin Hassani <ahassani@google.com> Wed Jul 26 20:58:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 20:58:03 2017 +0000
tree 7864abb72c3cb3b5ae935b3cce82dfec90bfc17b
parent fd6c39c730ef8ea46936375b40521334e8e57065
parent 4155520522b40a5e5f9b098eb903213d65d1cee6

Fix the long time ioctl problem.
am: 4155520522

Change-Id: If1ef88863a908098bd46e03d3725248ffafdab94

payload_consumer/delta_performer.cc

diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 94c5c60..12d3654 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -145,8 +145,8 @@
     const char* name;
   };
   const vector<blkioctl_request> blkioctl_requests = {
-      {BLKSECDISCARD, "BLKSECDISCARD"},
       {BLKDISCARD, "BLKDISCARD"},
+      {BLKSECDISCARD, "BLKSECDISCARD"},
 #ifdef BLKZEROOUT
       {BLKZEROOUT, "BLKZEROOUT"},
 #endif