Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 281981ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cciss: fix problem that deleting multiple logical drives could cause a panic
parents f3485c82 d8a0be6a

drivers/block/cciss.c

+5 −0
Original line number Diff line number Diff line
@@ -1693,6 +1693,11 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time) 
	for (i = 0; i <= h->highest_lun; i++) {

		int j;

		drv_found = 0;



		/* skip holes in the array from already deleted drives */

		if (h->drv[i].raid_level == -1)

			continue;



		for (j = 0; j < num_luns; j++) {

			memcpy(&lunid, &ld_buff->LUN[j][0], 4);

			lunid = le32_to_cpu(lunid);