Commit f3c869ca authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Paul E. McKenney

lib: bitmap: move ERANGE check from set_region to check_region

It makes sense to do all the checks in check_region() and not 1/2
in check_region and 1/2 in set_region.

Since set_region is called immediately after check_region, the net
effect on runtime is zero, but it gets rid of an if (...) return...

Cc: Yury Norov <yury.norov@gmail.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarYury Norov <yury.norov@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 9d7a3366
...@@ -500,17 +500,12 @@ struct region { ...@@ -500,17 +500,12 @@ struct region {
unsigned int nbits; unsigned int nbits;
}; };
static int bitmap_set_region(const struct region *r, unsigned long *bitmap) static void bitmap_set_region(const struct region *r, unsigned long *bitmap)
{ {
unsigned int start; unsigned int start;
if (r->end >= r->nbits)
return -ERANGE;
for (start = r->start; start <= r->end; start += r->group_len) for (start = r->start; start <= r->end; start += r->group_len)
bitmap_set(bitmap, start, min(r->end - start + 1, r->off)); bitmap_set(bitmap, start, min(r->end - start + 1, r->off));
return 0;
} }
static int bitmap_check_region(const struct region *r) static int bitmap_check_region(const struct region *r)
...@@ -518,6 +513,9 @@ static int bitmap_check_region(const struct region *r) ...@@ -518,6 +513,9 @@ static int bitmap_check_region(const struct region *r)
if (r->start > r->end || r->group_len == 0 || r->off > r->group_len) if (r->start > r->end || r->group_len == 0 || r->off > r->group_len)
return -EINVAL; return -EINVAL;
if (r->end >= r->nbits)
return -ERANGE;
return 0; return 0;
} }
...@@ -656,9 +654,7 @@ int bitmap_parselist(const char *buf, unsigned long *maskp, int nmaskbits) ...@@ -656,9 +654,7 @@ int bitmap_parselist(const char *buf, unsigned long *maskp, int nmaskbits)
if (ret) if (ret)
return ret; return ret;
ret = bitmap_set_region(&r, maskp); bitmap_set_region(&r, maskp);
if (ret)
return ret;
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment