On Thu, 2015-02-12 at 21:57 +0100, Markus Pargmann wrote:
> dprintk has some name collisions with other frameworks and drivers. It
> is also not necessary to have these custom debug print filters. Dynamic
> debug offers the same amount of filtered debugging.
>
> This patch replaces all dprintks with dev_dbg(). It also removes the
> ioctl dprintk which prints the ingoing ioctls which should be
> replaceable by strace or similar stuff.
Perhaps add
#define nbd_dbg(nbd, fmt, ...) \
dev_dbg(disk_to_dev((nbd)->disk), "%s: " fmt, \
nbd->disk->disk_name, ##__VA_ARGS__)
(or function with %pV)
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
[]
> +static void nbd_end_request(struct nbd_device *nbd, struct request *req)
> {
> int error = req->errors ? -EIO : 0;
> struct request_queue *q = req->q;
> unsigned long flags;
>
> - dprintk(DBG_BLKDEV, "%s: request %p: %s\n", req->rq_disk->disk_name,
> - req, error ? "failed" : "done");
> + dev_dbg(disk_to_dev(nbd->disk), "%s: request %p: %s\n",
> + req->rq_disk->disk_name, req, error ? "failed" : "done");
so this becomes
nbd_dbg(nbd, "request %p: %s\n",
req, error ? "failed" : "done");
> @@ -276,11 +239,9 @@ static int nbd_send_req(struct nbd_device *nbd, struct
> request *req)
> }
> memcpy(request.handle, &req, sizeof(req));
>
> - dprintk(DBG_TX, "%s: request %p: sending control (%s@%llu,%uB)\n",
> - nbd->disk->disk_name, req,
> - nbdcmd_to_ascii(nbd_cmd(req)),
> - (unsigned long long)blk_rq_pos(req) << 9,
> - blk_rq_bytes(req));
> + dev_dbg(disk_to_dev(nbd->disk), "%s: request %p: sending control
> (%s@%llu,%uB)\n",
> + nbd->disk->disk_name, req, nbdcmd_to_ascii(nbd_cmd(req)),
> + (unsigned long long)blk_rq_pos(req) << 9, blk_rq_bytes(req));
nbd_dbg(nbd, "request %p: sending control (%s@%llu,%uB)\n",
req, nbdcmd_to_ascii(nbd_cmd(req)),
(unsigned long long)blk_rq_pos(req) << 9, blk_rq_bytes(req));
> @@ -300,8 +261,8 @@ static int nbd_send_req(struct nbd_device *nbd, struct
> request *req)
> flags = 0;
> if (!rq_iter_last(bvec, iter))
> flags = MSG_MORE;
> - dprintk(DBG_TX, "%s: request %p: sending %d bytes
> data\n",
> - nbd->disk->disk_name, req, bvec.bv_len);
> + dev_dbg(disk_to_dev(nbd->disk), "%s: request %p:
> sending %d bytes data\n",
> + nbd->disk->disk_name, req, bvec.bv_len);
etc...
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Nbd-general mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nbd-general
