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

Commit a5674934 authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

drbd: Fix drbd_request_prepare() discard handling 



[ Upstream commit fad2d4ef636654e926d374ef038f4cd4286661f6 ]

Fix the test that verifies whether bio_op(bio) represents a discard
or write zeroes operation. Compile-tested only.

Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
Fixes: 7435e901 ("drbd: zero-out partial unaligned discards on local backend")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a9e8b68

drivers/block/drbd/drbd_req.c

+2 −2
Original line number Diff line number Diff line
@@ -1244,8 +1244,8 @@ drbd_request_prepare(struct drbd_device *device, struct bio *bio, unsigned long 
	_drbd_start_io_acct(device, req);



	/* process discards always from our submitter thread */

	if ((bio_op(bio) & REQ_OP_WRITE_ZEROES) ||

	    (bio_op(bio) & REQ_OP_DISCARD))

	if (bio_op(bio) == REQ_OP_WRITE_ZEROES ||

	    bio_op(bio) == REQ_OP_DISCARD)

		goto queue_for_submitter_thread;



	if (rw == WRITE && req->private_bio && req->i.size