Skip to content

Commit 3899d94

Browse files
chrboeaxboe
authored andcommitted
drbd: correctly submit flush bio on barrier
When we receive a flush command (or "barrier" in DRBD), we currently use a REQ_OP_FLUSH with the REQ_PREFLUSH flag set. The correct way to submit a flush bio is by using a REQ_OP_WRITE without any data, and set the REQ_PREFLUSH flag. Since commit b4a6bb3 ("block: add a sanity check for non-write flush/fua bios"), this triggers a warning in the block layer, but this has been broken for quite some time before that. So use the correct set of flags to actually make the flush happen. Cc: Christoph Hellwig <hch@infradead.org> Cc: stable@vger.kernel.org Fixes: f9ff0da ("drbd: allow parallel flushes for multi-volume resources") Reported-by: Thomas Voegtle <tv@lio96.de> Signed-off-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230503121937.17232-1-christoph.boehmwalder@linbit.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 7949aa4 commit 3899d94

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/block/drbd/drbd_receiver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ static void one_flush_endio(struct bio *bio)
12831283
static void submit_one_flush(struct drbd_device *device, struct issue_flush_context *ctx)
12841284
{
12851285
struct bio *bio = bio_alloc(device->ldev->backing_bdev, 0,
1286-
REQ_OP_FLUSH | REQ_PREFLUSH, GFP_NOIO);
1286+
REQ_OP_WRITE | REQ_PREFLUSH, GFP_NOIO);
12871287
struct one_flush_context *octx = kmalloc(sizeof(*octx), GFP_NOIO);
12881288

12891289
if (!octx) {

0 commit comments

Comments
 (0)