diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-01-31 16:57:27 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-31 14:00:25 -0700 |
| commit | 27410a8927fb89bd150de08d749a8ed7f67b7739 (patch) | |
| tree | 74f2f3cd9a594ef36703ffe7e2a57128e8293ed9 /drivers/block | |
| parent | 55460a8a7e6f42ecc62f24277effbcc0bc78a1e4 (diff) | |
nbd: remove REQ_TYPE_DRV_PRIV leftovers
Disconnects don't use block layer requests these days, so all handling
of private requests is dead code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nbd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 9fd06eeb1a17..d4c6281a181c 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -193,13 +193,6 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, set_bit(NBD_TIMEDOUT, &nbd->runtime_flags); req->errors++; - /* - * If our disconnect packet times out then we're already holding the - * config_lock and could deadlock here, so just set an error and return, - * we'll handle shutting everything down later. - */ - if (req->cmd_type == REQ_TYPE_DRV_PRIV) - return BLK_EH_HANDLED; mutex_lock(&nbd->config_lock); sock_shutdown(nbd); mutex_unlock(&nbd->config_lock); @@ -510,8 +503,7 @@ static void nbd_handle_cmd(struct nbd_cmd *cmd, int index) goto error_out; } - if (req->cmd_type != REQ_TYPE_FS && - req->cmd_type != REQ_TYPE_DRV_PRIV) + if (req->cmd_type != REQ_TYPE_FS) goto error_out; if (req->cmd_type == REQ_TYPE_FS && |