From: Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
Date: Sun, 9 Nov 2025 07:44:26 +0000 (-0800)
Subject: block: add lockdep to queue_limits_commit_update()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86afb1cdc28f4332c6e0a1937244e0a80d4d63b1;p=thirdparty%2Flinux.git

block: add lockdep to queue_limits_commit_update()

queue_limits_commit_update() expects q->limits_lock to be held by
the caller (via queue_limits_start_update()).

The API pattern is:

  lim = queue_limits_start_update(q);  /* acquires lock */
              /* modify lim */
  queue_limits_commit_update(q, &lim); /* releases lock */

  OR

  queue_limits_commit_update_frozen(q, &lim);
   lim = queue_limits_start_update(q); /* acquires lock */
  queue_limits_commit_update(q, &lim); /* releases lock */

Add lockdep_assert_held() to report incorrect API usage.

Signed-off-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-settings.c b/block/blk-settings.c
index e0d0b035f39d2..b38e94c85402a 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -546,6 +546,8 @@ int queue_limits_commit_update(struct request_queue *q,
 {
 	int error;
 
+	lockdep_assert_held(&q->limits_lock);
+
 	error = blk_validate_limits(lim);
 	if (error)
 		goto out_unlock;