diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-29 13:28:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-29 13:28:49 -0700 |
| commit | eafdc5071351314702175a3cd083cf6f7eef6488 (patch) | |
| tree | bac079f4c70d7258e2c5ac21b5ab89d361328374 | |
| parent | a98b95959b98f0015ea159292f516f9e8cc9e4db (diff) | |
| parent | a578a25339aca38e23bb5af6e3fc6c2c51f0215c (diff) | |
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
| -rw-r--r-- | block/blk-rq-qos.c | 2 | ||||
| -rw-r--r-- | block/disk-events.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c index 167be74df4ee..dd7310c94713 100644 --- 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 index 422db8292d09..13c3372c465a 100644 --- 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 |