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

Commit ec76a7b9 authored by Xiubo Li's avatar Xiubo Li Committed by Jens Axboe
Browse files

nbd: rename the runtime flags as NBD_RT_ prefixed 



Preparing for the destory when disconnecting crash fixing.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 58494c98

drivers/block/nbd.c

+37 −37
Original line number Diff line number Diff line
@@ -71,14 +71,14 @@ struct link_dead_args { 
	int index;

};



#define NBD_TIMEDOUT			0

#define NBD_DISCONNECT_REQUESTED	1

#define NBD_DISCONNECTED		2

#define NBD_HAS_PID_FILE		3

#define NBD_HAS_CONFIG_REF		4

#define NBD_BOUND			5

#define NBD_DESTROY_ON_DISCONNECT	6

#define NBD_DISCONNECT_ON_CLOSE 	7

#define NBD_RT_TIMEDOUT			0

#define NBD_RT_DISCONNECT_REQUESTED	1

#define NBD_RT_DISCONNECTED		2

#define NBD_RT_HAS_PID_FILE		3

#define NBD_RT_HAS_CONFIG_REF		4

#define NBD_RT_BOUND			5

#define NBD_RT_DESTROY_ON_DISCONNECT	6

#define NBD_RT_DISCONNECT_ON_CLOSE	7



struct nbd_config {

	u32 flags;
@@ -238,8 +238,8 @@ static void nbd_put(struct nbd_device *nbd) 


static int nbd_disconnected(struct nbd_config *config)

{

	return test_bit(NBD_DISCONNECTED, &config->runtime_flags) ||

		test_bit(NBD_DISCONNECT_REQUESTED, &config->runtime_flags);

	return test_bit(NBD_RT_DISCONNECTED, &config->runtime_flags) ||

		test_bit(NBD_RT_DISCONNECT_REQUESTED, &config->runtime_flags);

}



static void nbd_mark_nsock_dead(struct nbd_device *nbd, struct nbd_sock *nsock,
@@ -257,9 +257,9 @@ static void nbd_mark_nsock_dead(struct nbd_device *nbd, struct nbd_sock *nsock, 
	if (!nsock->dead) {

		kernel_sock_shutdown(nsock->sock, SHUT_RDWR);

		if (atomic_dec_return(&nbd->config->live_connections) == 0) {

			if (test_and_clear_bit(NBD_DISCONNECT_REQUESTED,

			if (test_and_clear_bit(NBD_RT_DISCONNECT_REQUESTED,

					       &nbd->config->runtime_flags)) {

				set_bit(NBD_DISCONNECTED,

				set_bit(NBD_RT_DISCONNECTED,

					&nbd->config->runtime_flags);

				dev_info(nbd_to_dev(nbd),

					"Disconnected due to user request.\n");
@@ -333,7 +333,7 @@ static void sock_shutdown(struct nbd_device *nbd) 


	if (config->num_connections == 0)

		return;

	if (test_and_set_bit(NBD_DISCONNECTED, &config->runtime_flags))

	if (test_and_set_bit(NBD_RT_DISCONNECTED, &config->runtime_flags))

		return;



	for (i = 0; i < config->num_connections; i++) {
@@ -427,7 +427,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, 
	}



	dev_err_ratelimited(nbd_to_dev(nbd), "Connection timed out\n");

	set_bit(NBD_TIMEDOUT, &config->runtime_flags);

	set_bit(NBD_RT_TIMEDOUT, &config->runtime_flags);

	cmd->status = BLK_STS_IOERR;

	mutex_unlock(&cmd->lock);

	sock_shutdown(nbd);
@@ -795,7 +795,7 @@ static int find_fallback(struct nbd_device *nbd, int index) 
	struct nbd_sock *nsock = config->socks[index];

	int fallback = nsock->fallback_index;



	if (test_bit(NBD_DISCONNECTED, &config->runtime_flags))

	if (test_bit(NBD_RT_DISCONNECTED, &config->runtime_flags))

		return new_index;



	if (config->num_connections <= 1) {
@@ -836,7 +836,7 @@ static int wait_for_reconnect(struct nbd_device *nbd) 
	struct nbd_config *config = nbd->config;

	if (!config->dead_conn_timeout)

		return 0;

	if (test_bit(NBD_DISCONNECTED, &config->runtime_flags))

	if (test_bit(NBD_RT_DISCONNECTED, &config->runtime_flags))

		return 0;

	return wait_event_timeout(config->conn_wait,

				  atomic_read(&config->live_connections) > 0,
@@ -969,12 +969,12 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, 
		return err;



	if (!netlink && !nbd->task_setup &&

	    !test_bit(NBD_BOUND, &config->runtime_flags))

	    !test_bit(NBD_RT_BOUND, &config->runtime_flags))

		nbd->task_setup = current;



	if (!netlink &&

	    (nbd->task_setup != current ||

	     test_bit(NBD_BOUND, &config->runtime_flags))) {

	     test_bit(NBD_RT_BOUND, &config->runtime_flags))) {

		dev_err(disk_to_dev(nbd->disk),

			"Device being setup by another task");

		sockfd_put(sock);
@@ -1053,7 +1053,7 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg) 
		mutex_unlock(&nsock->tx_lock);

		sockfd_put(old);



		clear_bit(NBD_DISCONNECTED, &config->runtime_flags);

		clear_bit(NBD_RT_DISCONNECTED, &config->runtime_flags);



		/* We take the tx_mutex in an error path in the recv_work, so we

		 * need to queue_work outside of the tx_mutex.
@@ -1124,7 +1124,7 @@ static int nbd_disconnect(struct nbd_device *nbd) 
	struct nbd_config *config = nbd->config;



	dev_info(disk_to_dev(nbd->disk), "NBD_DISCONNECT\n");

	set_bit(NBD_DISCONNECT_REQUESTED, &config->runtime_flags);

	set_bit(NBD_RT_DISCONNECT_REQUESTED, &config->runtime_flags);

	send_disconnects(nbd);

	return 0;

}
@@ -1143,7 +1143,7 @@ static void nbd_config_put(struct nbd_device *nbd) 
		struct nbd_config *config = nbd->config;

		nbd_dev_dbg_close(nbd);

		nbd_size_clear(nbd);

		if (test_and_clear_bit(NBD_HAS_PID_FILE,

		if (test_and_clear_bit(NBD_RT_HAS_PID_FILE,

				       &config->runtime_flags))

			device_remove_file(disk_to_dev(nbd->disk), &pid_attr);

		nbd->task_recv = NULL;
@@ -1209,7 +1209,7 @@ static int nbd_start_device(struct nbd_device *nbd) 
		dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n");

		return error;

	}

	set_bit(NBD_HAS_PID_FILE, &config->runtime_flags);

	set_bit(NBD_RT_HAS_PID_FILE, &config->runtime_flags);



	nbd_dev_dbg_init(nbd);

	for (i = 0; i < num_connections; i++) {
@@ -1256,9 +1256,9 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b 
	mutex_lock(&nbd->config_lock);

	nbd_bdev_reset(bdev);

	/* user requested, ignore socket errors */

	if (test_bit(NBD_DISCONNECT_REQUESTED, &config->runtime_flags))

	if (test_bit(NBD_RT_DISCONNECT_REQUESTED, &config->runtime_flags))

		ret = 0;

	if (test_bit(NBD_TIMEDOUT, &config->runtime_flags))

	if (test_bit(NBD_RT_TIMEDOUT, &config->runtime_flags))

		ret = -ETIMEDOUT;

	return ret;

}
@@ -1269,7 +1269,7 @@ static void nbd_clear_sock_ioctl(struct nbd_device *nbd, 
	sock_shutdown(nbd);

	__invalidate_device(bdev, true);

	nbd_bdev_reset(bdev);

	if (test_and_clear_bit(NBD_HAS_CONFIG_REF,

	if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF,

			       &nbd->config->runtime_flags))

		nbd_config_put(nbd);

}
@@ -1364,7 +1364,7 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode, 
	/* Don't allow ioctl operations on a nbd device that was created with

	 * netlink, unless it's DISCONNECT or CLEAR_SOCK, which are fine.

	 */

	if (!test_bit(NBD_BOUND, &config->runtime_flags) ||

	if (!test_bit(NBD_RT_BOUND, &config->runtime_flags) ||

	    (cmd == NBD_DISCONNECT || cmd == NBD_CLEAR_SOCK))

		error = __nbd_ioctl(bdev, nbd, cmd, arg);

	else
@@ -1435,7 +1435,7 @@ static void nbd_release(struct gendisk *disk, fmode_t mode) 
	struct nbd_device *nbd = disk->private_data;

	struct block_device *bdev = bdget_disk(disk, 0);



	if (test_bit(NBD_DISCONNECT_ON_CLOSE, &nbd->config->runtime_flags) &&

	if (test_bit(NBD_RT_DISCONNECT_ON_CLOSE, &nbd->config->runtime_flags) &&

			bdev->bd_openers == 0)

		nbd_disconnect_and_put(nbd);
@@ -1833,7 +1833,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) 
		return -ENOMEM;

	}

	refcount_set(&nbd->config_refs, 1);

	set_bit(NBD_BOUND, &config->runtime_flags);

	set_bit(NBD_RT_BOUND, &config->runtime_flags);



	ret = nbd_genl_size_set(info, nbd);

	if (ret)
@@ -1853,12 +1853,12 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) 
	if (info->attrs[NBD_ATTR_CLIENT_FLAGS]) {

		u64 flags = nla_get_u64(info->attrs[NBD_ATTR_CLIENT_FLAGS]);

		if (flags & NBD_CFLAG_DESTROY_ON_DISCONNECT) {

			set_bit(NBD_DESTROY_ON_DISCONNECT,

			set_bit(NBD_RT_DESTROY_ON_DISCONNECT,

				&config->runtime_flags);

			put_dev = true;

		}

		if (flags & NBD_CFLAG_DISCONNECT_ON_CLOSE) {

			set_bit(NBD_DISCONNECT_ON_CLOSE,

			set_bit(NBD_RT_DISCONNECT_ON_CLOSE,

				&config->runtime_flags);

		}

	}
@@ -1897,7 +1897,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) 
out:

	mutex_unlock(&nbd->config_lock);

	if (!ret) {

		set_bit(NBD_HAS_CONFIG_REF, &config->runtime_flags);

		set_bit(NBD_RT_HAS_CONFIG_REF, &config->runtime_flags);

		refcount_inc(&nbd->config_refs);

		nbd_connect_reply(info, nbd->index);

	}
@@ -1919,7 +1919,7 @@ static void nbd_disconnect_and_put(struct nbd_device *nbd) 
	 * queue.

	 */

	flush_workqueue(nbd->recv_workq);

	if (test_and_clear_bit(NBD_HAS_CONFIG_REF,

	if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF,

			       &nbd->config->runtime_flags))

		nbd_config_put(nbd);

}
@@ -2003,7 +2003,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 


	mutex_lock(&nbd->config_lock);

	config = nbd->config;

	if (!test_bit(NBD_BOUND, &config->runtime_flags) ||

	if (!test_bit(NBD_RT_BOUND, &config->runtime_flags) ||

	    !nbd->task_recv) {

		dev_err(nbd_to_dev(nbd),

			"not configured, cannot reconfigure\n");
@@ -2026,20 +2026,20 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
	if (info->attrs[NBD_ATTR_CLIENT_FLAGS]) {

		u64 flags = nla_get_u64(info->attrs[NBD_ATTR_CLIENT_FLAGS]);

		if (flags & NBD_CFLAG_DESTROY_ON_DISCONNECT) {

			if (!test_and_set_bit(NBD_DESTROY_ON_DISCONNECT,

			if (!test_and_set_bit(NBD_RT_DESTROY_ON_DISCONNECT,

					      &config->runtime_flags))

				put_dev = true;

		} else {

			if (test_and_clear_bit(NBD_DESTROY_ON_DISCONNECT,

			if (test_and_clear_bit(NBD_RT_DESTROY_ON_DISCONNECT,

					       &config->runtime_flags))

				refcount_inc(&nbd->refs);

		}



		if (flags & NBD_CFLAG_DISCONNECT_ON_CLOSE) {

			set_bit(NBD_DISCONNECT_ON_CLOSE,

			set_bit(NBD_RT_DISCONNECT_ON_CLOSE,

					&config->runtime_flags);

		} else {

			clear_bit(NBD_DISCONNECT_ON_CLOSE,

			clear_bit(NBD_RT_DISCONNECT_ON_CLOSE,

					&config->runtime_flags);

		}

	}