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

Commit 179e20b8 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Jens Axboe
Browse files

drbd: Minor cleanups 



 . Update comments
 . drbd_set_{in,out_of}_sync(): Remove unused parameters
 . Move common code into adm_del_resource()
 . Redefine ERR_MINOR_EXISTS -> ERR_MINOR_OR_VOLUME_EXISTS

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a64e6bb4

drivers/block/drbd/drbd_actlog.c

+1 −2
Original line number Diff line number Diff line
@@ -827,8 +827,7 @@ static int update_sync_bits(struct drbd_device *device, 
 *

 */

int __drbd_change_sync(struct drbd_device *device, sector_t sector, int size,

		enum update_sync_bits_mode mode,

		const char *file, const unsigned int line)

		enum update_sync_bits_mode mode)

{

	/* Is called from worker and receiver context _only_ */

	unsigned long sbnr, ebnr, lbnr;

drivers/block/drbd/drbd_int.h

+4 −5
Original line number Diff line number Diff line
@@ -1662,14 +1662,13 @@ extern void drbd_advance_rs_marks(struct drbd_device *device, unsigned long stil 


enum update_sync_bits_mode { RECORD_RS_FAILED, SET_OUT_OF_SYNC, SET_IN_SYNC };

extern int __drbd_change_sync(struct drbd_device *device, sector_t sector, int size,

		enum update_sync_bits_mode mode,

		const char *file, const unsigned int line);

		enum update_sync_bits_mode mode);

#define drbd_set_in_sync(device, sector, size) \

	__drbd_change_sync(device, sector, size, SET_IN_SYNC, __FILE__, __LINE__)

	__drbd_change_sync(device, sector, size, SET_IN_SYNC)

#define drbd_set_out_of_sync(device, sector, size) \

	__drbd_change_sync(device, sector, size, SET_OUT_OF_SYNC, __FILE__, __LINE__)

	__drbd_change_sync(device, sector, size, SET_OUT_OF_SYNC)

#define drbd_rs_failed_io(device, sector, size) \

	__drbd_change_sync(device, sector, size, RECORD_RS_FAILED, __FILE__, __LINE__)

	__drbd_change_sync(device, sector, size, RECORD_RS_FAILED)

extern void drbd_al_shrink(struct drbd_device *device);

extern int drbd_initialize_al(struct drbd_device *, void *);

drivers/block/drbd/drbd_main.c

+3 −3
Original line number Diff line number Diff line
@@ -2731,7 +2731,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 


	device = minor_to_device(minor);

	if (device)

		return ERR_MINOR_EXISTS;

		return ERR_MINOR_OR_VOLUME_EXISTS;



	/* GFP_KERNEL, we are outside of all write-out paths */

	device = kzalloc(sizeof(struct drbd_device), GFP_KERNEL);
@@ -2794,7 +2794,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 
	id = idr_alloc(&drbd_devices, device, minor, minor + 1, GFP_KERNEL);

	if (id < 0) {

		if (id == -ENOSPC) {

			err = ERR_MINOR_EXISTS;

			err = ERR_MINOR_OR_VOLUME_EXISTS;

			drbd_msg_put_info(adm_ctx->reply_skb, "requested minor exists already");

		}

		goto out_no_minor_idr;
@@ -2804,7 +2804,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 
	id = idr_alloc(&resource->devices, device, vnr, vnr + 1, GFP_KERNEL);

	if (id < 0) {

		if (id == -ENOSPC) {

			err = ERR_MINOR_EXISTS;

			err = ERR_MINOR_OR_VOLUME_EXISTS;

			drbd_msg_put_info(adm_ctx->reply_skb, "requested minor exists already");

		}

		goto out_idr_remove_minor;

drivers/block/drbd/drbd_nl.c

+26 −34
Original line number Diff line number Diff line
@@ -2052,7 +2052,7 @@ check_net_options(struct drbd_connection *connection, struct net_conf *new_net_c 
	rv = _check_net_options(connection, rcu_dereference(connection->net_conf), new_net_conf);

	rcu_read_unlock();



	/* connection->volumes protected by genl_lock() here */

	/* connection->peer_devices protected by genl_lock() here */

	idr_for_each_entry(&connection->peer_devices, peer_device, i) {

		struct drbd_device *device = peer_device->device;

		if (!device->bitmap) {
@@ -3483,7 +3483,7 @@ int drbd_adm_new_minor(struct sk_buff *skb, struct genl_info *info) 
	 * that first_peer_device(device)->connection and device->vnr match the request. */

	if (adm_ctx.device) {

		if (info->nlhdr->nlmsg_flags & NLM_F_EXCL)

			retcode = ERR_MINOR_EXISTS;

			retcode = ERR_MINOR_OR_VOLUME_EXISTS;

		/* else: still NO_ERROR */

		goto out;

	}
@@ -3530,6 +3530,27 @@ int drbd_adm_del_minor(struct sk_buff *skb, struct genl_info *info) 
	return 0;

}



static int adm_del_resource(struct drbd_resource *resource)

{

	struct drbd_connection *connection;



	for_each_connection(connection, resource) {

		if (connection->cstate > C_STANDALONE)

			return ERR_NET_CONFIGURED;

	}

	if (!idr_is_empty(&resource->devices))

		return ERR_RES_IN_USE;



	list_del_rcu(&resource->resources);

	/* Make sure all threads have actually stopped: state handling only

	 * does drbd_thread_stop_nowait(). */

	list_for_each_entry(connection, &resource->connections, connections)

		drbd_thread_stop(&connection->worker);

	synchronize_rcu();

	drbd_free_resource(resource);

	return NO_ERROR;

}



int drbd_adm_down(struct sk_buff *skb, struct genl_info *info)

{

	struct drbd_config_context adm_ctx;
@@ -3575,14 +3596,6 @@ int drbd_adm_down(struct sk_buff *skb, struct genl_info *info) 
		}

	}



	/* If we reach this, all volumes (of this connection) are Secondary,

	 * Disconnected, Diskless, aka Unconfigured. Make sure all threads have

	 * actually stopped, state handling only does drbd_thread_stop_nowait(). */

	for_each_connection(connection, resource)

		drbd_thread_stop(&connection->worker);



	/* Now, nothing can fail anymore */



	/* delete volumes */

	idr_for_each_entry(&resource->devices, device, i) {

		retcode = adm_del_minor(device);
@@ -3593,10 +3606,7 @@ int drbd_adm_down(struct sk_buff *skb, struct genl_info *info) 
		}

	}



	list_del_rcu(&resource->resources);

	synchronize_rcu();

	drbd_free_resource(resource);

	retcode = NO_ERROR;

	retcode = adm_del_resource(resource);

out:

	mutex_unlock(&resource->adm_mutex);

finish:
@@ -3608,7 +3618,6 @@ int drbd_adm_del_resource(struct sk_buff *skb, struct genl_info *info) 
{

	struct drbd_config_context adm_ctx;

	struct drbd_resource *resource;

	struct drbd_connection *connection;

	enum drbd_ret_code retcode;



	retcode = drbd_adm_prepare(&adm_ctx, skb, info, DRBD_ADM_NEED_RESOURCE);
@@ -3616,27 +3625,10 @@ int drbd_adm_del_resource(struct sk_buff *skb, struct genl_info *info) 
		return retcode;

	if (retcode != NO_ERROR)

		goto finish;



	resource = adm_ctx.resource;

	mutex_lock(&resource->adm_mutex);

	for_each_connection(connection, resource) {

		if (connection->cstate > C_STANDALONE) {

			retcode = ERR_NET_CONFIGURED;

			goto out;

		}

	}

	if (!idr_is_empty(&resource->devices)) {

		retcode = ERR_RES_IN_USE;

		goto out;

	}



	list_del_rcu(&resource->resources);

	for_each_connection(connection, resource)

		drbd_thread_stop(&connection->worker);

	synchronize_rcu();

	drbd_free_resource(resource);

	retcode = NO_ERROR;

out:

	mutex_lock(&resource->adm_mutex);

	retcode = adm_del_resource(resource);

	mutex_unlock(&resource->adm_mutex);

finish:

	drbd_adm_finish(&adm_ctx, info, retcode);

include/linux/drbd.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ enum drbd_ret_code { 
	ERR_RES_NOT_KNOWN	= 158,

	ERR_RES_IN_USE		= 159,

	ERR_MINOR_CONFIGURED    = 160,

	ERR_MINOR_EXISTS	= 161,

	ERR_MINOR_OR_VOLUME_EXISTS = 161,

	ERR_INVALID_REQUEST	= 162,

	ERR_NEED_APV_100	= 163,

	ERR_NEED_ALLOW_TWO_PRI  = 164,