commit 77e194d0b9ae1e7874c27bddacb40c91eec6f203
author Pierre-Hugues Husson <phh@archos.com> Tue Nov 28 19:03:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 28 19:03:30 2017 +0000
tree b85861dddf577d3da1e2239ab4b6b40fefe4bf83
parent 78c9969299c5a86591221a02d27428b6e667e653
parent 5687befd86bb11b7d655a09ec6fd36c91e839bd0

Merge "Workaround perdev_minors path change in Linux" am: d3870c5167
am: 5687befd86

Change-Id: I65e584b3fb56aea64a466afb933d9085ab35117a

Disk.cpp

diff --git a/Disk.cpp b/Disk.cpp
index 9c22400..2f6ed5e 100644
--- a/Disk.cpp
+++ b/Disk.cpp
@@ -50,7 +50,8 @@
 static const char* kSgdiskToken = " \t\n";
 
 static const char* kSysfsLoopMaxMinors = "/sys/module/loop/parameters/max_part";
-static const char* kSysfsMmcMaxMinors = "/sys/module/mmcblk/parameters/perdev_minors";
+static const char* kSysfsMmcMaxMinorsDeprecated = "/sys/module/mmcblk/parameters/perdev_minors";
+static const char* kSysfsMmcMaxMinors = "/sys/module/mmc_block/parameters/perdev_minors";
 
 static const unsigned int kMajorBlockLoop = 7;
 static const unsigned int kMajorBlockScsiA = 8;
@@ -566,7 +567,8 @@
     case kMajorBlockMmc: {
         // Per Documentation/devices.txt this is dynamic
         std::string tmp;
-        if (!ReadFileToString(kSysfsMmcMaxMinors, &tmp)) {
+        if (!ReadFileToString(kSysfsMmcMaxMinors, &tmp) &&
+                !ReadFileToString(kSysfsMmcMaxMinorsDeprecated, &tmp)) {
             LOG(ERROR) << "Failed to read max minors";
             return -errno;
         }