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

Commit 23c79d31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] Fix oops caused by queue refcounting failure
parents 0e833d8c e73e079b

drivers/scsi/scsi_scan.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -297,7 +297,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, 
		kfree(sdev);

		kfree(sdev);

		goto out;

		goto out;

	}

	}



	blk_get_queue(sdev->request_queue);

	sdev->request_queue->queuedata = sdev;

	sdev->request_queue->queuedata = sdev;

	scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);

	scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);

drivers/scsi/scsi_sysfs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -322,6 +322,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work) 
		kfree(evt);

		kfree(evt);

	}

	}





	blk_put_queue(sdev->request_queue);

	/* NULL queue means the device can't be used */

	/* NULL queue means the device can't be used */

	sdev->request_queue = NULL;

	sdev->request_queue = NULL;