block: remove unnecessary goto labels in debugfs attribute read methods

In some debugfs attribute read methods, failure to acquire the mutex
lock results in jumping to a label before returning an error code.
However this is unnecessary, as we can return the failure code directly,
improving code readability and reducing complexity.

This commit removes the goto labels and ensures that the method returns
immediately upon failing to acquire the mutex lock.

Signed-off-by: Nilay Shroff <nilay@linux.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20250313115235.3707600-3-nilay@linux.ibm.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1188/head
Nilay Shroff 2025-03-13 17:21:51 +05:30 committed by Jens Axboe
parent a3996d11f3
commit 78800f5997
1 changed files with 8 additions and 12 deletions

View File

@ -402,13 +402,12 @@ static int hctx_tags_show(void *data, struct seq_file *m)
res = mutex_lock_interruptible(&q->elevator_lock);
if (res)
goto out;
return res;
if (hctx->tags)
blk_mq_debugfs_tags_show(m, hctx->tags);
mutex_unlock(&q->elevator_lock);
out:
return res;
return 0;
}
static int hctx_tags_bitmap_show(void *data, struct seq_file *m)
@ -419,13 +418,12 @@ static int hctx_tags_bitmap_show(void *data, struct seq_file *m)
res = mutex_lock_interruptible(&q->elevator_lock);
if (res)
goto out;
return res;
if (hctx->tags)
sbitmap_bitmap_show(&hctx->tags->bitmap_tags.sb, m);
mutex_unlock(&q->elevator_lock);
out:
return res;
return 0;
}
static int hctx_sched_tags_show(void *data, struct seq_file *m)
@ -436,13 +434,12 @@ static int hctx_sched_tags_show(void *data, struct seq_file *m)
res = mutex_lock_interruptible(&q->elevator_lock);
if (res)
goto out;
return res;
if (hctx->sched_tags)
blk_mq_debugfs_tags_show(m, hctx->sched_tags);
mutex_unlock(&q->elevator_lock);
out:
return res;
return 0;
}
static int hctx_sched_tags_bitmap_show(void *data, struct seq_file *m)
@ -453,13 +450,12 @@ static int hctx_sched_tags_bitmap_show(void *data, struct seq_file *m)
res = mutex_lock_interruptible(&q->elevator_lock);
if (res)
goto out;
return res;
if (hctx->sched_tags)
sbitmap_bitmap_show(&hctx->sched_tags->bitmap_tags.sb, m);
mutex_unlock(&q->elevator_lock);
out:
return res;
return 0;
}
static int hctx_active_show(void *data, struct seq_file *m)