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>

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 9fd06eeb1a17b3880e2ad574f4ca081903a67961..d4c6281a181c0916afe9a5f38ded4869b798ee94 100644 (file)
--- 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 &&