/**
* TODO Assume root device is always mmcblk0*.
*/
-#define MMC_PATH "*/mmcblk[0-9]*"
-#define MMC_PARTITION_PATH "mmcblk[0-9]p[0-9]"
+#define MMC_PATH "*/mmcblk[0-9]*"
+#define MMC_PARTITION_PATH "mmcblk[0-9]p[0-9]"
/* Emulator send devlink for sdcard as \*\/sdcard\/\* */
-#define MMC_LINK_PATH "*/sdcard/*"
-#define SCSI_PATH "*/sd[a-z]*"
-#define SCSI_PARTITION_PATH "sd[a-z][0-9]"
-#define SCSI_PARTITION_LENGTH 9
-#define EXTENDEDSD_NODE_PATH "/dev/mapper/extendedsd"
+#define MMC_LINK_PATH "*/sdcard/*"
+#define SCSI_PATH "*/sd[a-z]*"
+#define SCSI_PARTITION_PATH "sd[a-z][0-9]"
+#define SCSI_PARTITION_LENGTH 9
+#define EXTENDEDSD_NODE_PATH "/dev/mapper/extendedsd"
-#define FILESYSTEM_NAME "filesystem"
+#define FILESYSTEM_NAME "filesystem"
-#define DEV_PREFIX "/dev/"
-#define ROOT_DIR "/"
+#define DEV_PREFIX "/dev/"
+#define ROOT_DIR "/"
-#define UNMOUNT_RETRY 5
-#define TIMEOUT_MAKE_OBJECT 500 /* milliseconds */
+#define UNMOUNT_RETRY 5
+#define TIMEOUT_MAKE_OBJECT 500 /* milliseconds */
-#define SIGNAL_POWEROFF_STATE "ChangeState"
-#define METHOD_ADD_POWEROFF_WAIT "AddPowerOffWait"
-#define METHOD_REMOVE_POWEROFF_WAIT "RemovePowerOffWait"
+#define SIGNAL_POWEROFF_STATE "ChangeState"
+#define METHOD_ADD_POWEROFF_WAIT "AddPowerOffWait"
+#define METHOD_REMOVE_POWEROFF_WAIT "RemovePowerOffWait"
-#define BLOCK_DEVICE_ADDED "DeviceAdded"
-#define BLOCK_DEVICE_REMOVED "DeviceRemoved"
-#define BLOCK_DEVICE_BLOCKED "DeviceBlocked"
-#define BLOCK_DEVICE_CHANGED "DeviceChanged"
+#define BLOCK_DEVICE_ADDED "DeviceAdded"
+#define BLOCK_DEVICE_REMOVED "DeviceRemoved"
+#define BLOCK_DEVICE_BLOCKED "DeviceBlocked"
+#define BLOCK_DEVICE_CHANGED "DeviceChanged"
-#define BLOCK_TYPE_MMC "mmc"
-#define BLOCK_TYPE_SCSI "scsi"
-#define BLOCK_TYPE_ALL "all"
+#define BLOCK_TYPE_MMC "mmc"
+#define BLOCK_TYPE_SCSI "scsi"
+#define BLOCK_TYPE_ALL "all"
-#define BLOCK_MMC_NODE_PREFIX "SDCard"
-#define BLOCK_SCSI_NODE_PREFIX "USBDrive"
+#define BLOCK_MMC_NODE_PREFIX "SDCard"
+#define BLOCK_SCSI_NODE_PREFIX "USBDrive"
-#define BLOCK_CONF_FILE "/etc/storaged/block.conf"
+#define BLOCK_CONF_FILE "/etc/storaged/block.conf"
-#define EXTERNAL_STORAGE_PATH "/run/storaged/external-storage"
-#define EXTENDED_INTERNAL_PATH "/run/storaged/extended-internal-sd"
-#define PATH_LEN 55
+#define EXTERNAL_STORAGE_PATH "/run/storaged/external-storage"
+#define EXTENDED_INTERNAL_PATH "/run/storaged/extended-internal-sd"
+#define PATH_LEN 55
-#define EXTENDEDSD_MOUNT_PATH "/opt/extendedsd"
+#define EXTENDEDSD_MOUNT_PATH "/opt/extendedsd"
-#define VFAT_NAME "vfat"
-#define EXFAT_NAME "exfat"
-#define EXT4_NAME "ext4"
-#define LUKS_NAME "crypto_LUKS"
-#define EXTENDEDSD_NAME "extendedsd"
+#define VFAT_NAME "vfat"
+#define EXFAT_NAME "exfat"
+#define EXT4_NAME "ext4"
+#define LUKS_NAME "crypto_LUKS"
+#define EXTENDEDSD_NAME "extendedsd"
/* Minimum value of block id */
#define BLOCK_ID_MIN 10
}
// Called by MainThread
-static int add_block_device(struct udev_device *dev, const char *devnode, bool mapper)
+static int add_block_device(struct udev_device *dev, const char *devnode, bool extended_internal)
{
struct block_data *data;
struct block_device *bdev;
return 0;
}
- if (mapper && !udev_device_get_property_value(dev, "ID_FS_TYPE")) {
+ if (extended_internal && !udev_device_get_property_value(dev, "ID_FS_TYPE")) {
char syspath[128] = {0};
char *r;
}
if (!block_control) {
- if (!mapper && strncmp(data->fs_type, LUKS_NAME, strlen(LUKS_NAME))) {
+ if (!extended_internal && strncmp(data->fs_type, LUKS_NAME, strlen(LUKS_NAME))) {
_D("Block module is disabled.");
free_block_data(data);
return -EPERM;
}
return 0;
- } else if (mapper && !strncmp(bdev->data->fs_type, EXT4_NAME, strlen(EXT4_NAME))) {
+ } else if (extended_internal && !strncmp(bdev->data->fs_type, EXT4_NAME, strlen(EXT4_NAME))) {
bdev->data->block_type = BLOCK_EXTENDEDSD_DEV;
ret = change_mount_point(bdev, EXTENDEDSD_MOUNT_PATH);
if (ret < 0) {
const char *action;
struct udev_list_entry *list_entry;
int r;
- bool mapper = false;
+ bool extended_internal = false;
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
const char *devlink = udev_list_entry_get_name(list_entry);
break;
}
if (!fnmatch(EXTENDEDSD_NODE_PATH, devlink, 0)) {
- mapper = true;
+ extended_internal = true;
devnode = devlink;
break;
}
_I("%s device %s.", devnode, action);
if (!strncmp(action, UDEV_ADD, sizeof(UDEV_ADD)) ||
- (mapper && !strcmp(action, UDEV_CHANGE))) {
+ (extended_internal && !strcmp(action, UDEV_CHANGE))) {
r = check_already_handled(devnode);
if (r < 0) {
_I("%s is already handled.", devnode);
return;
}
- add_block_device(dev, devnode, mapper);
+ add_block_device(dev, devnode, extended_internal);
} else if (!strncmp(action, UDEV_REMOVE, sizeof(UDEV_REMOVE))) {
remove_block_device(dev, devnode);
} else if (!strncmp(action, UDEV_CHANGE, sizeof(UDEV_CHANGE))) {