summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2009-07-17 02:08:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-07-17 02:08:57 -0700
commita27bd2c768084161b28571836956734b46b4a1da (patch)
tree49651c88d8a40f5f8c4b17fc36d0a4fa37217c76
parent3377bfd8451b33877318ddfef657e82fe7ed4c9c (diff)
parentb6e70d877886bf363c5789456dcc00bb3f271c95 (diff)
downloadsystem_core-a27bd2c768084161b28571836956734b46b4a1da.zip
system_core-a27bd2c768084161b28571836956734b46b4a1da.tar.gz
system_core-a27bd2c768084161b28571836956734b46b4a1da.tar.bz2
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
-rw-r--r--vold/volmgr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vold/volmgr.c b/vold/volmgr.c
index 17c9a49..b7c5ddc 100644
--- 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;