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

Commit e36e0c80 authored by Tejun Heo's avatar Tejun Heo Committed by James Bottomley
Browse files

[SCSI] SCSI: fix scsi_kill_request() busy count handling 



scsi_kill_request() completes requests via normal SCSI completion path
which decrements busy counts; however, requests which get passed to
scsi_kill_request() aren't holding busy counts and scsi_kill_request()
don't increment them before invoking completion path resulting in
incorrect busy counts.  Bump up busy counts before invoking completion
path.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent aedf3497

drivers/scsi/scsi_lib.c

+15 −0
Original line number Diff line number Diff line
@@ -1479,6 +1479,8 @@ static inline int scsi_host_queue_ready(struct request_queue *q, 
static void scsi_kill_request(struct request *req, request_queue_t *q)

{

	struct scsi_cmnd *cmd = req->special;

	struct scsi_device *sdev = cmd->device;

	struct Scsi_Host *shost = sdev->host;



	blkdev_dequeue_request(req);
@@ -1491,6 +1493,19 @@ static void scsi_kill_request(struct request *req, request_queue_t *q) 
	scsi_init_cmd_errh(cmd);

	cmd->result = DID_NO_CONNECT << 16;

	atomic_inc(&cmd->device->iorequest_cnt);



	/*

	 * SCSI request completion path will do scsi_device_unbusy(),

	 * bump busy counts.  To bump the counters, we need to dance

	 * with the locks as normal issue path does.

	 */

	sdev->device_busy++;

	spin_unlock(sdev->request_queue->queue_lock);

	spin_lock(shost->host_lock);

	shost->host_busy++;

	spin_unlock(shost->host_lock);

	spin_lock(sdev->request_queue->queue_lock);



	__scsi_done(cmd);

}