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

Commit f4ff414a authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

NVMe: Use requested sync command timeout 



Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a0a931d6

drivers/block/nvme-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
	req->__sector = (sector_t) -1;

	req->bio = req->biotail = NULL;



	req->timeout = ADMIN_TIMEOUT;

	req->timeout = timeout ? timeout : ADMIN_TIMEOUT;



	req->cmd = (unsigned char *)cmd;

	req->cmd_len = sizeof(struct nvme_command);