Skip to content

Fix an error path in disk_update_zone_resources() #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 2 commits into
base: linus-master_base
Choose a base branch
from
Open

Fix an error path in disk_update_zone_resources() #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59f314d
block: Annotate the queue limits functions
bvanassche Jan 14, 2026
8964e6d
block: Fix an error path in disk_update_zone_resources()
bvanassche Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions block/blk-zoned.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1957,6 +1957,7 @@ static int disk_update_zone_resources(struct gendisk *disk,

disk->nr_zones = args->nr_zones;
if (args->nr_conv_zones >= disk->nr_zones) {
queue_limits_cancel_update(q);
pr_warn("%s: Invalid number of conventional zones %u / %u\n",
disk->disk_name, args->nr_conv_zones, disk->nr_zones);
ret = -ENODEV;
Expand Down
8 changes: 6 additions & 2 deletions include/linux/blkdev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,14 +1084,17 @@ static inline unsigned int blk_boundary_sectors_left(sector_t offset,
*/
static inline struct queue_limits
queue_limits_start_update(struct request_queue *q)
__acquires(&q->limits_lock)
{
mutex_lock(&q->limits_lock);
return q->limits;
}
int queue_limits_commit_update_frozen(struct request_queue *q,
struct queue_limits *lim);
struct queue_limits *lim)
__releases(&q->limits_lock);
int queue_limits_commit_update(struct request_queue *q,
struct queue_limits *lim);
struct queue_limits *lim)
__releases(&q->limits_lock);
int queue_limits_set(struct request_queue *q, struct queue_limits *lim);
int blk_validate_limits(struct queue_limits *lim);

Expand All @@ -1104,6 +1107,7 @@ int blk_validate_limits(struct queue_limits *lim);
* starting update.
*/
static inline void queue_limits_cancel_update(struct request_queue *q)
__releases(&q->limits_lock)
{
mutex_unlock(&q->limits_lock);
}
Expand Down
Loading