Merge tag 'block-5.16-2021-12-03' of git://git.kernel.dk/linux-block

torvalds · torvalds · commit bbef3c7a63d2 · 2021-12-04T08:38:25.000-08:00
Pull block fix from Jens Axboe:
 "A single fix for repeated printk spam from loop"

* tag 'block-5.16-2021-12-03' of git://git.kernel.dk/linux-block:
  loop: Use pr_warn_once() for loop_control_remove() warning
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
@@ -2103,7 +2103,7 @@ static int loop_control_remove(int idx)
 	int ret;
 
 	if (idx < 0) {
-		pr_warn("deleting an unspecified loop device is not supported.\n");
+		pr_warn_once("deleting an unspecified loop device is not supported.\n");
 		return -EINVAL;
 	}
 		

Original file line number	Diff line number	Diff line change
`@@ -2103,7 +2103,7 @@ static int loop_control_remove(int idx)`
`2103`	`2103`	`int ret;`
`2104`	`2104`
`2105`	`2105`	`if (idx < 0) {`
`2106`		`- pr_warn("deleting an unspecified loop device is not supported.\n");`
	`2106`	`+ pr_warn_once("deleting an unspecified loop device is not supported.\n");`
`2107`	`2107`	`return -EINVAL;`
`2108`	`2108`	`}`
`2109`	`2109`