Merge tag 'block-6.6-2023-09-28' of git://git.kernel.dk/linux

torvalds · torvalds · commit eafdc5071351 · 2023-09-29T13:28:49.000-07:00
Pull block fixes from Jens Axboe:
 "Just two minor comment / documentation fixes for the block side"

* tag 'block-6.6-2023-09-28' of git://git.kernel.dk/linux:
  block: fix kernel-doc for disk_force_media_change()
  block: correct stale comment in rq_qos_wait
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
@@ -270,7 +270,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
 			finish_wait(&rqw->wait, &data.wq);
 
 			/*
-			 * We raced with wbt_wake_function() getting a token,
+			 * We raced with rq_qos_wake_function() getting a token,
 			 * which means we now have two. Put our local token
 			 * and wake anyone else potentially waiting for one.
 			 */
diff --git a/block/disk-events.c b/block/disk-events.c
@@ -290,7 +290,6 @@ EXPORT_SYMBOL(disk_check_media_change);
 /**
  * disk_force_media_change - force a media change event
  * @disk: the disk which will raise the event
- * @events: the events to raise
  *
  * Should be called when the media changes for @disk.  Generates a uevent
  * and attempts to free all dentries and inodes and invalidates all block

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,6 @@ EXPORT_SYMBOL(disk_check_media_change);`
`290`	`290`	`/**`
`291`	`291`	`* disk_force_media_change - force a media change event`
`292`	`292`	`* @disk: the disk which will raise the event`
`293`		`- * @events: the events to raise`
`294`	`293`	`*`
`295`	`294`	`* Should be called when the media changes for @disk. Generates a uevent`
`296`	`295`	`* and attempts to free all dentries and inodes and invalidates all block`