commit bdca8e2bf415b0bc7bd72da59874501bfb7c825f
author Amin Hassani <ahassani@google.com> Wed Jul 26 21:05:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 21:05:25 2017 +0000
tree 7864abb72c3cb3b5ae935b3cce82dfec90bfc17b
parent 1adc343e4b65051df762ce125d637e8af8c412ed
parent 2afc7b324559fc1c9b9f01bf28cb53cf8abf6855

Fix the long time ioctl problem. am: 4155520522 am: d4f07978c5
am: 2afc7b3245

Change-Id: Ie15a4f3dae341a633aee3d5f17e6007fab1e85af

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