Commit 0890d74f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[PATCH] consolidate timeout defintions in scsi.h 



Adapted from a patch in SuSE's kernel SRPM.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent a757e64c

drivers/block/scsi_ioctl.c

+0 −5
Original line number Diff line number Diff line
@@ -328,11 +328,6 @@ static int sg_io(struct file *file, request_queue_t *q, 
	return 0;

}



#define FORMAT_UNIT_TIMEOUT		(2 * 60 * 60 * HZ)

#define START_STOP_TIMEOUT		(60 * HZ)

#define MOVE_MEDIUM_TIMEOUT		(5 * 60 * HZ)

#define READ_ELEMENT_STATUS_TIMEOUT	(5 * 60 * HZ)

#define READ_DEFECT_DATA_TIMEOUT	(60 * HZ )

#define OMAX_SB_LEN 16          /* For backward compatibility */



static int sg_scsi_ioctl(struct file *file, request_queue_t *q,

drivers/scsi/scsi_ioctl.c

+0 −5
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ 


#define NORMAL_RETRIES			5

#define IOCTL_NORMAL_TIMEOUT			(10 * HZ)

#define FORMAT_UNIT_TIMEOUT		(2 * 60 * 60 * HZ)

#define START_STOP_TIMEOUT		(60 * HZ)

#define MOVE_MEDIUM_TIMEOUT		(5 * 60 * HZ)

#define READ_ELEMENT_STATUS_TIMEOUT	(5 * 60 * HZ)

#define READ_DEFECT_DATA_TIMEOUT	(60 * HZ )  /* ZIP-250 on parallel port takes as long! */



#define MAX_BUF PAGE_SIZE

include/scsi/scsi.h

+9 −0
Original line number Diff line number Diff line
@@ -360,6 +360,15 @@ struct scsi_lun { 
#define sense_error(sense)  ((sense) & 0xf)

#define sense_valid(sense)  ((sense) & 0x80);



/*

 * default timeouts

*/

#define FORMAT_UNIT_TIMEOUT		(2 * 60 * 60 * HZ)

#define START_STOP_TIMEOUT		(60 * HZ)

#define MOVE_MEDIUM_TIMEOUT		(5 * 60 * HZ)

#define READ_ELEMENT_STATUS_TIMEOUT	(5 * 60 * HZ)

#define READ_DEFECT_DATA_TIMEOUT	(60 * HZ )





#define IDENTIFY_BASE       0x80

#define IDENTIFY(can_disconnect, lun)   (IDENTIFY_BASE |\