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

Commit 3ab706fe authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: drbd_adm_prepare(): Only set adm_ctx.connection when a connection is requested 



Also change drbd_adm_connect() to expect a resource after it requested one.

Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent b6f85ef9

drivers/block/drbd/drbd_nl.c

+2 −6
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info, 
	adm_ctx.device = minor_to_device(d_in->minor);

	if (adm_ctx.resource_name) {

		adm_ctx.resource = drbd_find_resource(adm_ctx.resource_name);

		if (adm_ctx.resource) {

			adm_ctx.connection = first_connection(adm_ctx.resource);

			kref_get(&adm_ctx.connection->kref);

		}

	}



	if (!adm_ctx.device && (flags & DRBD_ADM_NEED_MINOR)) {
@@ -234,7 +230,7 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info, 
	}



	if (flags & DRBD_ADM_NEED_CONNECTION) {

		if (adm_ctx.connection && !(flags & DRBD_ADM_NEED_RESOURCE)) {

		if (adm_ctx.resource) {

			drbd_msg_put_info("no resource name expected");

			return ERR_INVALID_REQUEST;

		}
@@ -2211,7 +2207,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info) 
		}

	}



	connection = adm_ctx.connection;

	connection = first_connection(adm_ctx.resource);

	conn_reconfig_start(connection);



	if (connection->cstate > C_STANDALONE) {