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

Commit b9cef509 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: kill command serial number 



No users left, kill it.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f50e7605

drivers/scsi/scsi.c

+0 −16
Original line number Diff line number Diff line
@@ -174,22 +174,6 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition) 
}

#endif



/**

 * scsi_cmd_get_serial - Assign a serial number to a command

 * @host: the scsi host

 * @cmd: command to assign serial number to

 *

 * Description: a serial number identifies a request for error recovery

 * and debugging purposes.  Protected by the Host_Lock of host.

 */

void scsi_cmd_get_serial(struct Scsi_Host *host, struct scsi_cmnd *cmd)

{

	cmd->serial_number = host->cmd_serial_number++;

	if (cmd->serial_number == 0) 

		cmd->serial_number = host->cmd_serial_number++;

}

EXPORT_SYMBOL(scsi_cmd_get_serial);



/**

 * scsi_finish_command - cleanup and pass command back to upper layer

 * @cmd: the command

drivers/scsi/scsi_lib.c

+0 −1
Original line number Diff line number Diff line
@@ -316,7 +316,6 @@ EXPORT_SYMBOL(__scsi_execute); 
 */

static void scsi_init_cmd_errh(struct scsi_cmnd *cmd)

{

	cmd->serial_number = 0;

	scsi_set_resid(cmd, 0);

	memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);

	if (cmd->cmd_len == 0)

include/scsi/scsi_cmnd.h

+0 −10
Original line number Diff line number Diff line
@@ -74,16 +74,6 @@ struct scsi_cmnd { 


	int eh_eflags;		/* Used by error handlr */



	/*

	 * A SCSI Command is assigned a nonzero serial_number before passed

	 * to the driver's queue command function.  The serial_number is

	 * cleared when scsi_done is entered indicating that the command

	 * has been completed.  It is a bug for LLDDs to use this number

	 * for purposes other than printk (and even that is only useful

	 * for debugging).

	 */

	unsigned long serial_number;



	/*

	 * This is set to jiffies as it was when the command was first

	 * allocated.  It is used to time how long the command has

include/scsi/scsi_host.h

+0 −8
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ struct scsi_host_template { 
		unsigned long irq_flags;				\

		int rc;							\

		spin_lock_irqsave(shost->host_lock, irq_flags);		\

		scsi_cmd_get_serial(shost, cmd);			\

		rc = func_name##_lck (cmd, cmd->scsi_done);			\

		spin_unlock_irqrestore(shost->host_lock, irq_flags);	\

		return rc;						\
@@ -596,12 +595,6 @@ struct Scsi_Host { 
	 * is nr_hw_queues * can_queue.

	 */

	unsigned nr_hw_queues;

	/* 

	 * Used to assign serial numbers to the cmds.

	 * Protected by the host lock.

	 */

	unsigned long cmd_serial_number;

	

	unsigned active_mode:2;

	unsigned unchecked_isa_dma:1;
@@ -738,7 +731,6 @@ extern int scsi_host_busy(struct Scsi_Host *shost); 
extern void scsi_host_put(struct Scsi_Host *t);

extern struct Scsi_Host *scsi_host_lookup(unsigned short);

extern const char *scsi_host_state_name(enum scsi_host_state);

extern void scsi_cmd_get_serial(struct Scsi_Host *, struct scsi_cmnd *);



static inline int __must_check scsi_add_host(struct Scsi_Host *host,

					     struct device *dev)