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

Commit 19391830 authored by Markus Pargmann's avatar Markus Pargmann Committed by Jens Axboe
Browse files

nbd: Remove 'harderror' and propagate error properly 



Instead of a variable 'harderror' we can simply try to correctly
propagate errors to the userspace.

This patch removes the harderror variable and passes errors through
error pointers and nbd_do_it back to the userspace.

Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 260bbce4

drivers/block/nbd.c

+14 −14
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ 




struct nbd_device {

struct nbd_device {

	int flags;

	int flags;

	int harderror;		/* Code of hard error			*/

	struct socket * sock;	/* If == NULL, device is not ready, yet	*/

	struct socket * sock;	/* If == NULL, device is not ready, yet	*/

	int magic;

	int magic;
@@ -329,26 +328,24 @@ static struct request *nbd_read_stat(struct nbd_device *nbd) 
	if (result <= 0) {

	if (result <= 0) {

		dev_err(disk_to_dev(nbd->disk),

		dev_err(disk_to_dev(nbd->disk),

			"Receive control failed (result %d)\n", result);

			"Receive control failed (result %d)\n", result);

		goto harderror;

		return ERR_PTR(result);

	}

	}





	if (ntohl(reply.magic) != NBD_REPLY_MAGIC) {

	if (ntohl(reply.magic) != NBD_REPLY_MAGIC) {

		dev_err(disk_to_dev(nbd->disk), "Wrong magic (0x%lx)\n",

		dev_err(disk_to_dev(nbd->disk), "Wrong magic (0x%lx)\n",

				(unsigned long)ntohl(reply.magic));

				(unsigned long)ntohl(reply.magic));

		result = -EPROTO;

		return ERR_PTR(-EPROTO);

		goto harderror;

	}

	}





	req = nbd_find_request(nbd, *(struct request **)reply.handle);

	req = nbd_find_request(nbd, *(struct request **)reply.handle);

	if (IS_ERR(req)) {

	if (IS_ERR(req)) {

		result = PTR_ERR(req);

		result = PTR_ERR(req);

		if (result != -ENOENT)

		if (result != -ENOENT)

			goto harderror;

			return ERR_PTR(result);





		dev_err(disk_to_dev(nbd->disk), "Unexpected reply (%p)\n",

		dev_err(disk_to_dev(nbd->disk), "Unexpected reply (%p)\n",

			reply.handle);

			reply.handle);

		result = -EBADR;

		return ERR_PTR(-EBADR);

		goto harderror;

	}

	}





	if (ntohl(reply.error)) {

	if (ntohl(reply.error)) {
@@ -376,9 +373,6 @@ static struct request *nbd_read_stat(struct nbd_device *nbd) 
		}

		}

	}

	}

	return req;

	return req;

harderror:

	nbd->harderror = result;

	return NULL;

}

}





static ssize_t pid_show(struct device *dev,

static ssize_t pid_show(struct device *dev,
@@ -413,8 +407,15 @@ static int nbd_do_it(struct nbd_device *nbd) 




	nbd->task_recv = current;

	nbd->task_recv = current;





	while ((req = nbd_read_stat(nbd)) != NULL)

	while (1) {

		req = nbd_read_stat(nbd);

		if (IS_ERR(req)) {

			ret = PTR_ERR(req);

			break;

		}



		nbd_end_request(nbd, req);

		nbd_end_request(nbd, req);

	}





	nbd->task_recv = NULL;

	nbd->task_recv = NULL;
@@ -734,8 +735,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, 
		kthread_stop(thread);

		kthread_stop(thread);





		mutex_lock(&nbd->tx_lock);

		mutex_lock(&nbd->tx_lock);

		if (error)



			return error;

		sock_shutdown(nbd);

		sock_shutdown(nbd);

		sock = nbd->sock;

		sock = nbd->sock;

		nbd->sock = NULL;

		nbd->sock = NULL;
@@ -754,7 +754,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, 
			blkdev_reread_part(bdev);

			blkdev_reread_part(bdev);

		if (nbd->disconnect) /* user requested, ignore socket errors */

		if (nbd->disconnect) /* user requested, ignore socket errors */

			return 0;

			return 0;

		return nbd->harderror;

		return error;

	}

	}





	case NBD_CLEAR_QUE:

	case NBD_CLEAR_QUE: