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

Commit ee57a05c authored by Kevin Vigor's avatar Kevin Vigor Committed by Jens Axboe
Browse files

nbd: Consistently use request pointer in debug messages. 



Existing dev_dbg messages sometimes identify request using request
pointer, sometimes using nbd_cmd pointer. This makes it hard to
follow request flow. Consistently use request pointer instead.

Reviewed-by: default avatarJosef Bacik <jbacik@toxicpanda.com>
Signed-off-by: default avatarKevin Vigor <kvigor@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 645d4095

drivers/block/nbd.c

+5 −5
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static void nbd_complete_rq(struct request *req) 
{

	struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);



	dev_dbg(nbd_to_dev(cmd->nbd), "request %p: %s\n", cmd,

	dev_dbg(nbd_to_dev(cmd->nbd), "request %p: %s\n", req,

		cmd->status ? "failed" : "done");



	blk_mq_end_request(req, cmd->status);
@@ -482,7 +482,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) 
	memcpy(request.handle, &tag, sizeof(tag));



	dev_dbg(nbd_to_dev(nbd), "request %p: sending control (%s@%llu,%uB)\n",

		cmd, nbdcmd_to_ascii(type),

		req, nbdcmd_to_ascii(type),

		(unsigned long long)blk_rq_pos(req) << 9, blk_rq_bytes(req));

	result = sock_xmit(nbd, index, 1, &from,

			(type == NBD_CMD_WRITE) ? MSG_MORE : 0, &sent);
@@ -518,7 +518,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) 
			int flags = is_last ? 0 : MSG_MORE;



			dev_dbg(nbd_to_dev(nbd), "request %p: sending %d bytes data\n",

				cmd, bvec.bv_len);

				req, bvec.bv_len);

			iov_iter_bvec(&from, ITER_BVEC | WRITE,

				      &bvec, 1, bvec.bv_len);

			if (skip) {
@@ -610,7 +610,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) 
		return cmd;

	}



	dev_dbg(nbd_to_dev(nbd), "request %p: got reply\n", cmd);

	dev_dbg(nbd_to_dev(nbd), "request %p: got reply\n", req);

	if (rq_data_dir(req) != WRITE) {

		struct req_iterator iter;

		struct bio_vec bvec;
@@ -637,7 +637,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) 
				return ERR_PTR(-EIO);

			}

			dev_dbg(nbd_to_dev(nbd), "request %p: got %d bytes data\n",

				cmd, bvec.bv_len);

				req, bvec.bv_len);

		}

	} else {

		/* See the comment in nbd_queue_rq. */