block: include func name in __get_request prints (7b2b10e0) · Commits · 戴 / test

In __get_request calls to printk_ratelimited, include the function name so the callbacks suppressed message matches the messages that are printed, and add "dev" before the device name so it matches other block layer messages. Signed-off-by:

Robert Elliott <elliott@hp.com> Reviewed-by:

Webb Scales <webbnh@hp.com> Signed-off-by:

Jens Axboe <axboe@fb.com>

block/blk-core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1060,8 +1060,8 @@ fail_elvpriv:
		* shouldn't stall IO. Treat this request as !elvpriv. This will
		* disturb iosched and blkcg but weird is bettern than dead.
		*/
		printk_ratelimited(KERN_WARNING "%s: request aux data allocation failed, iosched may be disturbed\n",
		dev_name(q->backing_dev_info.dev));
		printk_ratelimited(KERN_WARNING "%s: dev %s: request aux data allocation failed, iosched may be disturbed\n",
		__func__, dev_name(q->backing_dev_info.dev));

		rq->cmd_flags &= ~REQ_ELVPRIV;
		rq->elv.icq = NULL;

Admin message