diff options
| author | Liu Song <liusong@linux.alibaba.com> | 2022-08-26 11:14:13 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-08-26 07:32:53 -0600 |
| commit | ddbfc34fcf5d0bc33b006b90c580c56edeb31068 (patch) | |
| tree | 517dcae1f8faf3dcf83e14c2183a9bc4fec55433 | |
| parent | f2cc648e12285c53365c2bcacbcd919022f4d3a8 (diff) | |
| download | lwn-ddbfc34fcf5d0bc33b006b90c580c56edeb31068.tar.gz lwn-ddbfc34fcf5d0bc33b006b90c580c56edeb31068.zip | |
sbitmap: remove unnecessary code in __sbitmap_queue_get_batch
If "nr + nr_tags <= map_depth", then the value of nr_tags will not be
greater than map_depth, so no additional comparison is required.
Signed-off-by: Liu Song <liusong@linux.alibaba.com>
Link: https://lore.kernel.org/r/1661483653-27326-1-git-send-email-liusong@linux.alibaba.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | lib/sbitmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/sbitmap.c b/lib/sbitmap.c index 1f31147872e6..a39b1a877366 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -533,10 +533,9 @@ unsigned long __sbitmap_queue_get_batch(struct sbitmap_queue *sbq, int nr_tags, nr = find_first_zero_bit(&map->word, map_depth); if (nr + nr_tags <= map_depth) { atomic_long_t *ptr = (atomic_long_t *) &map->word; - int map_tags = min_t(int, nr_tags, map_depth); unsigned long val, ret; - get_mask = ((1UL << map_tags) - 1) << nr; + get_mask = ((1UL << nr_tags) - 1) << nr; do { val = READ_ONCE(map->word); if ((val & ~get_mask) != val) @@ -547,7 +546,7 @@ unsigned long __sbitmap_queue_get_batch(struct sbitmap_queue *sbq, int nr_tags, if (get_mask) { *offset = nr + (index << sb->shift); update_alloc_hint_after_get(sb, depth, hint, - *offset + map_tags - 1); + *offset + nr_tags - 1); return get_mask; } } |