Commit eafdc507 authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents a98b9595 a578a253
...@@ -270,7 +270,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data, ...@@ -270,7 +270,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
finish_wait(&rqw->wait, &data.wq); 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 * which means we now have two. Put our local token
* and wake anyone else potentially waiting for one. * and wake anyone else potentially waiting for one.
*/ */
......
...@@ -290,7 +290,6 @@ EXPORT_SYMBOL(disk_check_media_change); ...@@ -290,7 +290,6 @@ EXPORT_SYMBOL(disk_check_media_change);
/** /**
* disk_force_media_change - force a media change event * disk_force_media_change - force a media change event
* @disk: the disk which will raise the 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 * Should be called when the media changes for @disk. Generates a uevent
* and attempts to free all dentries and inodes and invalidates all block * and attempts to free all dentries and inodes and invalidates all block
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment