diff options
| author |   Bart Van Assche <bart.vanassche@wdc.com> | 2018-06-25 15:51:30 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-06-29 07:53:21 -0600 |
| commit | fad2d4ef636654e926d374ef038f4cd4286661f6 (patch) | |
| tree | 37c783585bbdc348eff13ba2e7773e22c3b12bf4 /drivers/block/drbd/drbd_req.c | |
| parent | blk-mq: don't queue more if we get a busy return (diff) | |
| download | linux-dev-fad2d4ef636654e926d374ef038f4cd4286661f6.tar.xz linux-dev-fad2d4ef636654e926d374ef038f4cd4286661f6.zip | |
drbd: Fix drbd_request_prepare() discard handling
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: 7435e9018f91 ("drbd: zero-out partial unaligned discards on local backend")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index a47e4987ee46..d146fedc38bb 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -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 |