scsi: split __scsi_queue_insert (de3e8bf3) · Commits · 戴 / test

drivers/scsi/scsi_lib.c

+26 −18

Original line number	Original line	Diff line number	Diff line
	@@ -75,28 +75,12 @@ struct kmem_cache *scsi_sdb_cache;
	*/		*/
	#define SCSI_QUEUE_DELAY 3		#define SCSI_QUEUE_DELAY 3

	/**		static void
	* __scsi_queue_insert - private queue insertion		scsi_set_blocked(struct scsi_cmnd *cmd, int reason)
	* @cmd: The SCSI command being requeued
	* @reason: The reason for the requeue
	* @unbusy: Whether the queue should be unbusied
	*
	* This is a private queue insertion. The public interface
	* scsi_queue_insert() always assumes the queue should be unbusied
	* because it's always called before the completion. This function is
	* for a requeue after completion, which should only occur in this
	* file.
	*/
	static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
	{		{
	struct Scsi_Host *host = cmd->device->host;		struct Scsi_Host *host = cmd->device->host;
	struct scsi_device *device = cmd->device;		struct scsi_device *device = cmd->device;
	struct scsi_target *starget = scsi_target(device);		struct scsi_target *starget = scsi_target(device);
	struct request_queue *q = device->request_queue;
	unsigned long flags;

	SCSI_LOG_MLQUEUE(1, scmd_printk(KERN_INFO, cmd,
	"Inserting command %p into mlqueue\n", cmd));

	/*		/*
	* Set the appropriate busy bit for the device/host.		* Set the appropriate busy bit for the device/host.
	@@ -123,6 +107,30 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
	starget->target_blocked = starget->max_target_blocked;		starget->target_blocked = starget->max_target_blocked;
	break;		break;
	}		}
			}

			/**
			* __scsi_queue_insert - private queue insertion
			* @cmd: The SCSI command being requeued
			* @reason: The reason for the requeue
			* @unbusy: Whether the queue should be unbusied
			*
			* This is a private queue insertion. The public interface
			* scsi_queue_insert() always assumes the queue should be unbusied
			* because it's always called before the completion. This function is
			* for a requeue after completion, which should only occur in this
			* file.
			*/
			static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
			{
			struct scsi_device *device = cmd->device;
			struct request_queue *q = device->request_queue;
			unsigned long flags;

			SCSI_LOG_MLQUEUE(1, scmd_printk(KERN_INFO, cmd,
			"Inserting command %p into mlqueue\n", cmd));

			scsi_set_blocked(cmd, reason);

	/*		/*
	* Decrement the counters, since these commands are no longer		* Decrement the counters, since these commands are no longer

Admin message