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
This commit is contained in:
commit
281981ca87
1 changed files with 5 additions and 0 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue