diff options
| author | Lars Ellenberg | 2014-04-28 18:43:24 +0200 |
|---|---|---|
| committer | Jens Axboe | 2014-04-30 21:46:55 +0200 |
| commit | 2f632aeb5302da93f760d965e970600b35907026 (patch) | |
| tree | 861956cd7be0e3126a1decd359da61ab62eaddbe /drivers/block/drbd/drbd_worker.c | |
| parent | drbd: prepare receiving side for REQ_DISCARD (diff) | |
| download | kernel-qcow2-linux-2f632aeb5302da93f760d965e970600b35907026.tar.gz kernel-qcow2-linux-2f632aeb5302da93f760d965e970600b35907026.tar.xz kernel-qcow2-linux-2f632aeb5302da93f760d965e970600b35907026.zip | |
drbd: prepare sending side for REQ_DISCARD
Note that I do NOT call __drbd_chk_io_error for failed REQ_DISCARD.
That may be wrong, though, or needs to differ between EOPNOTSUPP and
other errors...
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/drbd/drbd_worker.c')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 5fd4eaee49bc..26338bedb25b 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -267,7 +267,12 @@ void drbd_request_endio(struct bio *bio, int error) /* to avoid recursion in __req_mod */ if (unlikely(error)) { - what = (bio_data_dir(bio) == WRITE) + if (bio->bi_rw & REQ_DISCARD) + what = (error == -EOPNOTSUPP) + ? DISCARD_COMPLETED_NOTSUPP + : DISCARD_COMPLETED_WITH_ERROR; + else + what = (bio_data_dir(bio) == WRITE) ? WRITE_COMPLETED_WITH_ERROR : (bio_rw(bio) == READ) ? READ_COMPLETED_WITH_ERROR |