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

Commit 63bd4dfb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: sd: separate timeout for discard command"

parents 01be607a 717a1ad6

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static int sd_setup_discard_cmnd(struct scsi_device *sdp, struct request *rq) 


	sector >>= ilog2(sdp->sector_size) - 9;

	nr_sectors >>= ilog2(sdp->sector_size) - 9;

	rq->timeout = SD_TIMEOUT;

	rq->timeout = SD_DISCARD_TIMEOUT;



	memset(rq->cmd, 0, rq->cmd_len);

drivers/scsi/sd.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 * Time out in seconds for disks and Magneto-opticals (which are slower).

 */

#define SD_TIMEOUT		(30 * HZ)

#define SD_DISCARD_TIMEOUT	(30 * HZ)

#define SD_MOD_TIMEOUT		(75 * HZ)

#define SD_FLUSH_TIMEOUT	(60 * HZ)

#define SD_WRITE_SAME_TIMEOUT	(120 * HZ)