commit 5687befd86bb11b7d655a09ec6fd36c91e839bd0
author Pierre-Hugues Husson <phh@archos.com> Tue Nov 28 18:59:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 28 18:59:56 2017 +0000
tree 41c7d95baaa2bf1c03a79bc9ad7b71ea2a7667ea
parent 2b1b72d183f53abf307e124542693d27fc6dc6c7
parent d3870c51672615064929c871ec70f45490f51136

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

Change-Id: Ia7ec03a566f8c122dff05bcc3d996c05cf2b7771

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;
         }