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

Commit 0cbc591b authored by Denis Cheng's avatar Denis Cheng Committed by Linus Torvalds
Browse files

nbd: change a parameter's type to remove a memcpy call 



This memcpy looks so strange, in fact it's merely a pointer dereference, so I
change the parameter's type to refer it more directly, this could make the
memcpy not needed anymore.

In the function nbd_read_stat where nbd_find_request is only once called, the
parameter served should be transformed accordingly.

Signed-off-by: default avatarDenis Cheng <crquan@gmail.com>
Cc: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d2c9740b

drivers/block/nbd.c

+3 −5
Original line number Diff line number Diff line
@@ -231,14 +231,12 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req) 
	return 1;

}



static struct request *nbd_find_request(struct nbd_device *lo, char *handle)

static struct request *nbd_find_request(struct nbd_device *lo,

					struct request *xreq)

{

	struct request *req, *tmp;

	struct request *xreq;

	int err;



	memcpy(&xreq, handle, sizeof(xreq));



	err = wait_event_interruptible(lo->active_wq, lo->active_req != xreq);

	if (unlikely(err))

		goto out;
@@ -293,7 +291,7 @@ static struct request *nbd_read_stat(struct nbd_device *lo) 
		goto harderror;

	}



	req = nbd_find_request(lo, reply.handle);

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

	if (unlikely(IS_ERR(req))) {

		result = PTR_ERR(req);

		if (result != -ENOENT)