tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp

Browse source 
Change-Id: I103db47198ad09783aa6539cde271df0fdb9c594
This commit is contained in:
Jean-Baptiste Queru 2010-11-19 10:20:37 -08:00
commit 1206e872ce
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DirectVolume.cpp
View file

@ -197,8 +197,8 @@ void DirectVolume::handlePartitionAdded(const char *devpath, NetlinkEvent *evt)
#ifdef PARTITION_DEBUG #ifdef PARTITION_DEBUG
SLOGD("Dv:partAdd: part_num = %d, minor = %d\n", part_num, minor); SLOGD("Dv:partAdd: part_num = %d, minor = %d\n", part_num, minor);
#endif #endif
if (part_num >= MAX_PARTITIONS) { if (part_num > MAX_PARTITIONS) {
SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS-1); SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS);
} else { } else {
mPartMinors[part_num -1] = minor; mPartMinors[part_num -1] = minor;
} }

8
Volume.cpp
View file

@ -218,6 +218,7 @@ int Volume::formatVol() {
setState(Volume::State_Formatting); setState(Volume::State_Formatting);
int ret = -1;
// Only initialize the MBR if we are formatting the entire device // Only initialize the MBR if we are formatting the entire device
if (formatEntireDevice) { if (formatEntireDevice) {
sprintf(devicePath, "/dev/block/vold/%d:%d", sprintf(devicePath, "/dev/block/vold/%d:%d",
@ -241,10 +242,11 @@ int Volume::formatVol() {
goto err; goto err;
} }
setState(Volume::State_Idle); ret = 0;
return 0;
err: err:
return -1; setState(Volume::State_Idle);
return ret;
} }
bool Volume::isMountpointMounted(const char *path) { bool Volume::isMountpointMounted(const char *path) {