提交: a24f3a00d33cd10fc9623787af4b866e203f200b - system-core (git)

system/core

Commit MetaInfo

• 修訂: a24f3a00d33cd10fc9623787af4b866e203f200b (tree)
• 時間: 2010-04-14 19:19:54
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

vold: add fat partition type detection, and fix a crash bug

Change Summary

• modified: vold/volmgr.c
• modified: vold/volmgr_vfat.c

差異

--- a/vold/volmgr.c
+++ b/vold/volmgr.c
@@ -1157,7 +1157,7 @@ static int _volmgr_start(volume_t *vol, blkdev_t *dev)
             break;
     }
 
-    if (!fs) {
+    if (!fs->name) {
         LOGE("No supported filesystems on %d:%d", dev->major, dev->minor);
         volume_setstate(vol, volstate_nofs);
         return -ENODATA;

--- a/vold/volmgr_vfat.c
+++ b/vold/volmgr_vfat.c
@@ -36,7 +36,18 @@ int vfat_identify(blkdev_t *dev)
 #if VFAT_DEBUG
     LOG_VOL("vfat_identify(%d:%d):", dev->major, dev->minor);
 #endif
-    return 0; // XXX: Implement
+    switch (dev->part_type) {
+    case 0x1:
+    case 0x4:
+    case 0x6:
+    case 0xb:
+    case 0xc:
+    case 0xe:
+    case 0xf:
+        return 0;
+    default:
+        return -ENODATA;
+    }
 }
 
 const char *vfat_parttype(blkdev_t *dev)
@@ -164,8 +175,8 @@ int vfat_mount(blkdev_t *dev, volume_t *vol, boolean safe_mode)
     }
 
 #if VFAT_DEBUG
-    LOG_VOL("vfat_mount(%s, %d:%d): mount rc = %d", dev->major,k dev->minor,
-            vol->mount_point, rc);
+    LOG_VOL("vfat_mount(%s, %d:%d): mount rc = %d", vol->mount_point,
+            dev->major, dev->minor, rc);
 #endif
     free (devpath);
     return rc;