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

Commit 1e6f2416 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

scsi: don't allow setting of queue_depth bigger than can_queue 



We won't ever queue more commands than the host allows.  Instead of
letting drivers either reject or ignore this case handle it in
common code.  Note that various driver use internal constant or
variables that are assigned to both shost->can_queue and checked
in ->change_queue_depth - I did remove those checks as well.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent c40ecc12

drivers/infiniband/ulp/srp/ib_srp.c

+1 −7
Original line number Diff line number Diff line
@@ -2410,14 +2410,8 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event) 
static int

srp_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)

{

	struct Scsi_Host *shost = sdev->host;

	int max_depth;



	max_depth = shost->can_queue;

	if (!sdev->tagged_supported)

		max_depth = 1;

	if (qdepth > max_depth)

		qdepth = max_depth;

		qdepth = 1;

	scsi_adjust_queue_depth(sdev, qdepth);

	return sdev->queue_depth;

}

drivers/scsi/3w-9xxx.c

+0 −2
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ static int twa_change_queue_depth(struct scsi_device *sdev, int queue_depth, 
	if (reason != SCSI_QDEPTH_DEFAULT)

		return -EOPNOTSUPP;



	if (queue_depth > TW_Q_LENGTH-2)

		queue_depth = TW_Q_LENGTH-2;

	scsi_adjust_queue_depth(sdev, queue_depth);

	return queue_depth;

} /* End twa_change_queue_depth() */

drivers/scsi/3w-sas.c

+0 −2
Original line number Diff line number Diff line
@@ -198,8 +198,6 @@ static int twl_change_queue_depth(struct scsi_device *sdev, int queue_depth, 
	if (reason != SCSI_QDEPTH_DEFAULT)

		return -EOPNOTSUPP;



	if (queue_depth > TW_Q_LENGTH-2)

		queue_depth = TW_Q_LENGTH-2;

	scsi_adjust_queue_depth(sdev, queue_depth);

	return queue_depth;

} /* End twl_change_queue_depth() */

drivers/scsi/3w-xxxx.c

+0 −2
Original line number Diff line number Diff line
@@ -530,8 +530,6 @@ static int tw_change_queue_depth(struct scsi_device *sdev, int queue_depth, 
	if (reason != SCSI_QDEPTH_DEFAULT)

		return -EOPNOTSUPP;



	if (queue_depth > TW_Q_LENGTH-2)

		queue_depth = TW_Q_LENGTH-2;

	scsi_adjust_queue_depth(sdev, queue_depth);

	return queue_depth;

} /* End tw_change_queue_depth() */

drivers/scsi/hpsa.c

+0 −5
Original line number Diff line number Diff line
@@ -4082,11 +4082,6 @@ static int hpsa_change_queue_depth(struct scsi_device *sdev, 
	if (reason != SCSI_QDEPTH_DEFAULT)

		return -ENOTSUPP;



	if (qdepth < 1)

		qdepth = 1;

	else

		if (qdepth > h->nr_cmds)

			qdepth = h->nr_cmds;

	scsi_adjust_queue_depth(sdev, qdepth);

	return sdev->queue_depth;

}