Commit 31ade7d4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

ubd: untagle discard vs write zeroes not support handling 



Discard and Write Zeroes are different operation and implemented
by different fallocate opcodes for ubd.  If one fails the other one
can work and vice versa.

Split the code to disable the operations in ubd_handler to only
disable the operation that actually failed.

Fixes: 50109b5a ("um: Add support for DISCARD in the UBD Driver")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Acked-By: default avatarAnton Ivanov <anton.ivanov@cambridgegreys.com>
Link: https://lore.kernel.org/r/20240531074837.1648501-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5db755fb

arch/um/drivers/ubd_kern.c

+5 −4
Original line number Diff line number Diff line
@@ -449,9 +449,10 @@ static int bulk_req_safe_read( 


static void ubd_end_request(struct io_thread_req *io_req)

{

	if (io_req->error == BLK_STS_NOTSUPP &&

	    req_op(io_req->req) == REQ_OP_DISCARD) {

	if (io_req->error == BLK_STS_NOTSUPP) {

		if (req_op(io_req->req) == REQ_OP_DISCARD)

			blk_queue_max_discard_sectors(io_req->req->q, 0);

		else if (req_op(io_req->req) == REQ_OP_WRITE_ZEROES)

			blk_queue_max_write_zeroes_sectors(io_req->req->q, 0);

	}

	blk_mq_end_request(io_req->req, io_req->error);