Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afaef205 authored by Sandeep Patil's avatar Sandeep Patil
Browse files

Revert "ANDROID: dm: do_mounts_dm: Rebase on top of 4.9" 



This reverts commit 398884b9.

Bug: 129143048
Test: Boot cuttlefish from AOSP

Signed-off-by: default avatarSandeep Patil <sspatil@android.com>
parent 357c3d31

init/do_mounts_dm.c

+0 −16
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/string.h>



#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 @@ static void __init dm_setup_drive(void) 
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: