Skip to content

Commit

Permalink
s390/cio: fix length calculation in idset.c
Browse files Browse the repository at this point in the history
bitmap_or uses the number of bits as its length parameter and
not the number of words necessary to store those bits.

This fixes a regression introduced by:
	aa92b33 s390/cio: use generic bitmap functions

Reported-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Acked-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Sebastian Ott authored and Martin Schwidefsky committed Nov 6, 2012
1 parent 99e639b commit 7f0bc6c
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/s390/cio/idset.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ int idset_is_empty(struct idset *set)

void idset_add_set(struct idset *to, struct idset *from)
{
int len = min(__BITOPS_WORDS(to->num_ssid * to->num_id),
__BITOPS_WORDS(from->num_ssid * from->num_id));
int len = min(to->num_ssid * to->num_id, from->num_ssid * from->num_id);

bitmap_or(to->bitmap, to->bitmap, from->bitmap, len);
}

0 comments on commit 7f0bc6c

Please sign in to comment.