Commit ddbfc34f authored by Liu Song's avatar Liu Song Committed by Jens Axboe
Browse files

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: default avatarLiu Song <liusong@linux.alibaba.com>
Link: https://lore.kernel.org/r/1661483653-27326-1-git-send-email-liusong@linux.alibaba.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f2cc648e

lib/sbitmap.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

			}

		}