Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27410a89 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 55460a8a

drivers/block/nbd.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -193,13 +193,6 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, 
	set_bit(NBD_TIMEDOUT, &nbd->runtime_flags);

	set_bit(NBD_TIMEDOUT, &nbd->runtime_flags);

	req->errors++;

	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);

	mutex_lock(&nbd->config_lock);

	sock_shutdown(nbd);

	sock_shutdown(nbd);

	mutex_unlock(&nbd->config_lock);

	mutex_unlock(&nbd->config_lock);
@@ -510,8 +503,7 @@ static void nbd_handle_cmd(struct nbd_cmd *cmd, int index) 
		goto error_out;

		goto error_out;

	}

	}





	if (req->cmd_type != REQ_TYPE_FS &&

	if (req->cmd_type != REQ_TYPE_FS)

	    req->cmd_type != REQ_TYPE_DRV_PRIV)

		goto error_out;

		goto error_out;





	if (req->cmd_type == REQ_TYPE_FS &&

	if (req->cmd_type == REQ_TYPE_FS &&