commit 352d3f9a0987a75ddddb7b3ded1ed41dfa0b572a
author Kenny Root <kroot@google.com> Tue Feb 01 23:38:11 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 01 23:38:11 2011 -0800
tree f9df6f9314f0f5508740dafd35d9a783176b0eea
parent 06c6baf3afaa3d40cbab21d22b91f0aa99778b52
parent 18ed56400bb6ae999712ba70af385100d0cd6e55

am 18ed5640: Merge "Use LOOP_GET_STATUS64 for checking loop devices" into honeycomb

* commit '18ed56400bb6ae999712ba70af385100d0cd6e55':
  Use LOOP_GET_STATUS64 for checking loop devices

Loop.cpp

diff --git a/Loop.cpp b/Loop.cpp
index fdba249..e8f4048 100644
--- a/Loop.cpp
+++ b/Loop.cpp
@@ -128,7 +128,7 @@
     char filename[256];
 
     for (i = 0; i < LOOP_MAX; i++) {
-        struct loop_info li;
+        struct loop_info64 li;
         int rc;
 
         sprintf(filename, "/dev/block/loop%d", i);
@@ -151,7 +151,7 @@
             return -1;
         }
 
-        rc = ioctl(fd, LOOP_GET_STATUS, &li);
+        rc = ioctl(fd, LOOP_GET_STATUS64, &li);
         if (rc < 0 && errno == ENXIO)
             break;