diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2014-04-28 18:43:24 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-30 21:46:55 +0200 |
| commit | 2f632aeb5302da93f760d965e970600b35907026 (patch) | |
| tree | 861956cd7be0e3126a1decd359da61ab62eaddbe /drivers/block/drbd/drbd_req.c | |
| parent | drbd: prepare receiving side for REQ_DISCARD (diff) | |
| download | linux-2f632aeb5302da93f760d965e970600b35907026.tar.xz 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_req.c')
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 3779c8d2875b..7aadd0906b01 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -522,6 +522,13 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, mod_rq_state(req, m, RQ_LOCAL_PENDING, RQ_LOCAL_COMPLETED); break; + case DISCARD_COMPLETED_NOTSUPP: + case DISCARD_COMPLETED_WITH_ERROR: + /* I'd rather not detach from local disk just because it + * failed a REQ_DISCARD. */ + mod_rq_state(req, m, RQ_LOCAL_PENDING, RQ_LOCAL_COMPLETED); + break; + case QUEUE_FOR_NET_READ: /* READ or READA, and * no local disk, |