mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-11-01 09:13:37 +00:00 
			
		
		
		
	nvme: fix error-handling for io_uring nvme-passthrough
Driver may return an error before submitting the command to the device.
Ensure that such error is propagated up.
Fixes: 456cba386e ("nvme: wire-up uring-cmd support for io-passthru on char-device.")
Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
			
			
This commit is contained in:
		
							parent
							
								
									983a338b96
								
							
						
					
					
						commit
						1147dd0503
					
				
					 1 changed files with 5 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -510,10 +510,13 @@ static enum rq_end_io_ret nvme_uring_cmd_end_io(struct request *req,
 | 
			
		|||
	struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd);
 | 
			
		||||
 | 
			
		||||
	req->bio = pdu->bio;
 | 
			
		||||
	if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
 | 
			
		||||
	if (nvme_req(req)->flags & NVME_REQ_CANCELLED) {
 | 
			
		||||
		pdu->nvme_status = -EINTR;
 | 
			
		||||
	else
 | 
			
		||||
	} else {
 | 
			
		||||
		pdu->nvme_status = nvme_req(req)->status;
 | 
			
		||||
		if (!pdu->nvme_status)
 | 
			
		||||
			pdu->nvme_status = blk_status_to_errno(err);
 | 
			
		||||
	}
 | 
			
		||||
	pdu->u.result = le64_to_cpu(nvme_req(req)->result.u64);
 | 
			
		||||
 | 
			
		||||
	/*
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue