block: Call pipe_trigger() for BLOCK_LUKS_CLOSE operation 65/162565/3 accepted/tizen/unified/20171205.060702 submit/tizen/20171204.104825
authorpr.jung <pr.jung@samsung.com>
Mon, 4 Dec 2017 08:21:01 +0000 (17:21 +0900)
committerJung <pr.jung@samsung.com>
Mon, 4 Dec 2017 09:30:39 +0000 (09:30 +0000)
Change-Id: I2676b017768797cc4d70bc3f20818827f4eafdfd
Signed-off-by: pr.jung <pr.jung@samsung.com>
src/block/block.c

index 94b3f1d..d183b7b 100644 (file)
@@ -979,6 +979,9 @@ static bool pipe_cb(int fd, void *data)
                        get_operation_char(pdata.op),
                        pdata.bdev, pdata.result);
 
+       if (pdata.op == BLOCK_LUKS_CLOSE)
+               goto out;
+
        if (pdata.op == BLOCK_DEV_MOUNT && pdata.result < 0) {
                if (pdata.bdev->data->state == BLOCK_UNMOUNT) {
                        ret = change_mount_point(pdata.bdev, "");
@@ -1604,7 +1607,7 @@ static int block_format_device(struct block_device *bdev, void *data)
 
        ret = format_block_device(bdev, fdata->fs_type, fdata->option);
        if (ret < 0)
-               _E("fail to mount block device for %s", bdev->data->devnode);
+               _E("fail to format block device for %s", bdev->data->devnode);
 
 out:
        release_format_data(fdata);
@@ -1858,7 +1861,7 @@ static void trigger_operation(struct block_device *bdev, dd_list *queue, struct
                pthread_mutex_unlock(&(th_manager[thread_id].mutex));
                /* UNLOCK */
 
-               if (operation == BLOCK_DEV_INSERT || operation == BLOCK_DEV_REMOVE) {
+               if (operation == BLOCK_DEV_INSERT || operation == BLOCK_DEV_REMOVE || operation == BLOCK_LUKS_CLOSE) {
                        if (pipe_trigger(operation, bdev, 0) < 0)
                                _E("fail to trigger pipe");
                }
@@ -2752,6 +2755,8 @@ static void uevent_block_handler(struct udev_device *dev)
                        _E("fail to update block data for %s", bdev->data->devnode);
                if (!strncmp(bdev->data->fs_type, LUKS_NAME, strlen(LUKS_NAME)))
                        _I("filesystem type is updated: crypto_LUKS");
+               if (bdev->data->fs_usage)
+                       _I("fs_usage: %s", bdev->data->fs_usage);
        }
 }