提交: a27bd2c768084161b28571836956734b46b4a1da - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• 修訂: a27bd2c768084161b28571836956734b46b4a1da (tree)
• 時間: 2009-07-17 18:08:57
• 作者: San Mehat <san@goog...>
• Commiter: Android Git Automerger

Log Message

am b6e70d87: vold: Allow a damaged volume to be re-evaluated for mounting

Merge commit 'b6e70d877886bf363c5789456dcc00bb3f271c95'

* commit 'b6e70d877886bf363c5789456dcc00bb3f271c95':

vold: Allow a damaged volume to be re-evaluated for mounting

Change Summary

• modified: vold/volmgr.c

差異

--- a/vold/volmgr.c
+++ b/vold/volmgr.c
@@ -523,8 +523,7 @@ static int _volmgr_consider_disk_and_vol(volume_t *vol, blkdev_t *dev)
 
     if (vol->state == volstate_unknown ||
         vol->state == volstate_mounted ||
-        vol->state == volstate_mounted_ro ||
-        vol->state == volstate_damaged) {
+        vol->state == volstate_mounted_ro) {
         LOGE("Cannot consider volume '%s' because it is in state '%d", 
              vol->mount_point, vol->state);
         return -EADDRINUSE;