diff options
| author | San Mehat <san@google.com> | 2010-03-10 12:48:57 -0800 |
|---|---|---|
| committer | San Mehat <san@google.com> | 2010-03-10 15:18:41 -0800 |
| commit | 2a5b8ce09b8836a8463ef9beaaff865c36ca5e6a (patch) | |
| tree | cf01f405676eb9f72fed9ad3f54c5d1e9571b00f /DirectVolume.cpp | |
| parent | d071596fd998f4d2bc58a7580f61c15a87a92fd5 (diff) | |
| download | system_vold-2a5b8ce09b8836a8463ef9beaaff865c36ca5e6a.tar.gz system_vold-2a5b8ce09b8836a8463ef9beaaff865c36ca5e6a.tar.bz2 system_vold-2a5b8ce09b8836a8463ef9beaaff865c36ca5e6a.zip | |
vold: Switch to using libdiskconfig for partition setup.
Also handles an issue where NPARTS=0 on a disk change uevent
Change-Id: I77c56f177dc65df91468bbd7d5fe1889db414d7a
Signed-off-by: San Mehat <san@google.com>
Diffstat (limited to 'DirectVolume.cpp')
| -rw-r--r-- | DirectVolume.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/DirectVolume.cpp b/DirectVolume.cpp index dcb1a05..fd99f0c 100644 --- a/DirectVolume.cpp +++ b/DirectVolume.cpp @@ -178,6 +178,10 @@ void DirectVolume::handlePartitionAdded(const char *devpath, NetlinkEvent *evt) part_num = 1; } + if (part_num > mDiskNumParts) { + mDiskNumParts = part_num; + } + if (major != mDiskMajor) { LOGE("Partition '%s' has a different major than its disk!", devpath); return; @@ -192,7 +196,9 @@ void DirectVolume::handlePartitionAdded(const char *devpath, NetlinkEvent *evt) #ifdef PARTITION_DEBUG LOGD("Dv:partAdd: Got all partitions - ready to rock!"); #endif - setState(Volume::State_Idle); + if (getState() != Volume::State_Formatting) { + setState(Volume::State_Idle); + } } else { #ifdef PARTITION_DEBUG LOGD("Dv:partAdd: pending mask now = 0x%x", mPendingPartMap); @@ -224,15 +230,19 @@ void DirectVolume::handleDiskChanged(const char *devpath, NetlinkEvent *evt) { } mPendingPartMap = partmask; - if (mDiskNumParts == 0) { - setState(Volume::State_Idle); - } else { - setState(Volume::State_Pending); + if (getState() != Volume::State_Formatting) { + if (mDiskNumParts == 0) { + setState(Volume::State_Idle); + } else { + setState(Volume::State_Pending); + } } - } void DirectVolume::handlePartitionChanged(const char *devpath, NetlinkEvent *evt) { + int major = atoi(evt->findParam("MAJOR")); + int minor = atoi(evt->findParam("MINOR")); + LOGD("Volume %s %s partition %d:%d changed\n", getLabel(), getMountpoint(), major, minor); } void DirectVolume::handleDiskRemoved(const char *devpath, NetlinkEvent *evt) { |