Skip to content

Commit c3042a5

Browse files
johnpgarryaxboe
authored andcommitted
block: Drop locking annotation for limits_lock
Currently compiling block/blk-settings.c with C=1 gives the following warning: block/blk-settings.c:262:9: warning: context imbalance in 'queue_limits_commit_update' - wrong count at exit request_queue.limits_lock is a mutex. Sparse locking annotation for mutexes are currently not supported - see [0] - so drop that locking annotation. [0] https://lore.kernel.org/lkml/cover.1579893447.git.jbi.octave@gmail.com/T/#mbb8bda6c0a7ca7ce19f46df976a8e3b489745488 Fixes: d690cb8 ("block: add an API to atomically update queue limits") Signed-off-by: John Garry <john.g.garry@oracle.com> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20240614090345.655716-3-john.g.garry@oracle.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent d9c2332 commit c3042a5

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

block/blk-settings.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ int blk_set_default_limits(struct queue_limits *lim)
303303
*/
304304
int queue_limits_commit_update(struct request_queue *q,
305305
struct queue_limits *lim)
306-
__releases(q->limits_lock)
307306
{
308307
int error;
309308

include/linux/blkdev.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,6 @@ static inline unsigned int blk_chunk_sectors_left(sector_t offset,
893893
*/
894894
static inline struct queue_limits
895895
queue_limits_start_update(struct request_queue *q)
896-
__acquires(q->limits_lock)
897896
{
898897
mutex_lock(&q->limits_lock);
899898
return q->limits;

0 commit comments

Comments
 (0)