OSDN Git Service

sbitmap: remove unnecessary code in __sbitmap_queue_get_batch
authorLiu Song <liusong@linux.alibaba.com>
Fri, 26 Aug 2022 03:14:13 +0000 (11:14 +0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 26 Aug 2022 13:32:53 +0000 (07:32 -0600)
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>
lib/sbitmap.c

index 1f31147..a39b1a8 100644 (file)
@@ -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;
                        }
                }