commit d3870c51672615064929c871ec70f45490f51136
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 28 18:45:30 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 28 18:45:30 2017 +0000
tree d00616c68221bec7b6d82a3f56dca746d72d96ba
parent 997e60556369710a5682b84af3eb112e14aeafd1
parent f347cd0249ccb16dd5147b1f6a6272670d78c517

Merge "Workaround perdev_minors path change in Linux"

Disk.cpp

diff --git a/Disk.cpp b/Disk.cpp
index b424aba..6c09295 100644
--- a/Disk.cpp
+++ b/Disk.cpp
@@ -49,7 +49,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;
@@ -559,7 +560,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;
         }