From fdba7ec2d15c939a98ec17ea3b2af5f53c027ee6 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Tue, 3 Mar 2020 04:04:51 +0800 Subject: [PATCH] [ALPS04672712] Revert "ANDROID: dm: do_mounts_dm: Rebase on top of 4.9" This reverts commit 398884b9e1d8208ac8bb89ec8eaa23e84b4cbda9. Bug: 129143048 Test: Boot cuttlefish from AOSP MTK-Commit-Id: f8520d091547ccdc5b07f4420439ea9f4adac507 Change-Id: Id7576a894f4595bd7d7b9dc42d653dafc41bb772 Signed-off-by: Sandeep Patil Signed-off-by: Miles Chen CR-Id: ALPS04672712 Feature: [Module]Kernel Maintenance --- init/do_mounts_dm.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/init/do_mounts_dm.c b/init/do_mounts_dm.c index 0fe9c5f7d5e9..e76c137a4cb6 100755 --- a/init/do_mounts_dm.c +++ b/init/do_mounts_dm.c @@ -10,7 +10,6 @@ #include #include "do_mounts.h" -#include "../drivers/md/dm.h" #define DM_MAX_NAME 32 #define DM_MAX_UUID 129 @@ -334,7 +333,6 @@ static void __init dm_setup_drive(void) goto dm_table_create_fail; } - dm_lock_md_type(md); target = dm_setup_args.target; while (target) { DMINFO("adding target '%llu %llu %s %s'", @@ -354,17 +352,6 @@ static void __init dm_setup_drive(void) goto table_complete_fail; } - if (dm_get_md_type(md) == DM_TYPE_NONE) { - dm_set_md_type(md, dm_table_get_type(table)); - if (dm_setup_md_queue(md, table)) { - DMWARN("unable to set up device queue for new table."); - goto setup_md_queue_fail; - } - } else if (dm_get_md_type(md) != dm_table_get_type(table)) { - DMWARN("can't change device type after initial table load."); - goto setup_md_queue_fail; - } - /* Suspend the device so that we can bind it to the table. */ if (dm_suspend(md, 0)) { DMDEBUG("failed to suspend the device pre-bind"); @@ -393,7 +380,6 @@ static void __init dm_setup_drive(void) } printk(KERN_INFO "dm: dm-%d is ready\n", dm_setup_args.minor); - dm_unlock_md_type(md); dm_setup_cleanup(); return; @@ -401,10 +387,8 @@ export_fail: resume_fail: table_bind_fail: suspend_fail: -setup_md_queue_fail: table_complete_fail: add_target_fail: - dm_unlock_md_type(md); dm_table_create_fail: dm_put(md); dm_create_fail: