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

Commit 4f8c9510 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: rename REQ_TYPE_SPECIAL to REQ_TYPE_DRV_PRIV 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent dac56212

drivers/block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, 
		fsync_bdev(bdev);

		mutex_lock(&nbd->tx_lock);

		blk_rq_init(NULL, &sreq);

		sreq.cmd_type = REQ_TYPE_SPECIAL;

		sreq.cmd_type = REQ_TYPE_DRV_PRIV;

		nbd_cmd(&sreq) = NBD_CMD_DISC;



		/* Check again after getting mutex back.  */

drivers/block/paride/pd.c

+2 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static char *pd_buf; /* buffer for request in progress */ 


static enum action do_pd_io_start(void)

{

	if (pd_req->cmd_type == REQ_TYPE_SPECIAL) {

	if (pd_req->cmd_type == REQ_TYPE_DRV_PRIV) {

		phase = pd_special;

		return pd_special();

	}
@@ -725,7 +725,7 @@ static int pd_special_command(struct pd_unit *disk, 
	if (IS_ERR(rq))

		return PTR_ERR(rq);



	rq->cmd_type = REQ_TYPE_SPECIAL;

	rq->cmd_type = REQ_TYPE_DRV_PRIV;

	rq->special = func;



	err = blk_execute_rq(disk->gd->queue, disk->gd, rq, 0);

drivers/block/sx8.c

+2 −2
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx) 
	spin_unlock_irq(&host->lock);



	DPRINTK("blk_execute_rq_nowait, tag == %u\n", idx);

	crq->rq->cmd_type = REQ_TYPE_SPECIAL;

	crq->rq->cmd_type = REQ_TYPE_DRV_PRIV;

	crq->rq->special = crq;

	blk_execute_rq_nowait(host->oob_q, NULL, crq->rq, true, NULL);
@@ -661,7 +661,7 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func) 
	crq->msg_bucket = (u32) rc;



	DPRINTK("blk_execute_rq_nowait, tag == %u\n", idx);

	crq->rq->cmd_type = REQ_TYPE_SPECIAL;

	crq->rq->cmd_type = REQ_TYPE_DRV_PRIV;

	crq->rq->special = crq;

	blk_execute_rq_nowait(host->oob_q, NULL, crq->rq, true, NULL);

drivers/block/virtio_blk.c

+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static inline void virtblk_request_done(struct request *req) 
		req->resid_len = virtio32_to_cpu(vblk->vdev, vbr->in_hdr.residual);

		req->sense_len = virtio32_to_cpu(vblk->vdev, vbr->in_hdr.sense_len);

		req->errors = virtio32_to_cpu(vblk->vdev, vbr->in_hdr.errors);

	} else if (req->cmd_type == REQ_TYPE_SPECIAL) {

	} else if (req->cmd_type == REQ_TYPE_DRV_PRIV) {

		req->errors = (error != 0);

	}
@@ -188,7 +188,7 @@ static int virtio_queue_rq(struct blk_mq_hw_ctx *hctx, 
			vbr->out_hdr.sector = 0;

			vbr->out_hdr.ioprio = cpu_to_virtio32(vblk->vdev, req_get_ioprio(vbr->req));

			break;

		case REQ_TYPE_SPECIAL:

		case REQ_TYPE_DRV_PRIV:

			vbr->out_hdr.type = cpu_to_virtio32(vblk->vdev, VIRTIO_BLK_T_GET_ID);

			vbr->out_hdr.sector = 0;

			vbr->out_hdr.ioprio = cpu_to_virtio32(vblk->vdev, req_get_ioprio(vbr->req));
@@ -251,7 +251,7 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) 
		return PTR_ERR(req);

	}



	req->cmd_type = REQ_TYPE_SPECIAL;

	req->cmd_type = REQ_TYPE_DRV_PRIV;

	err = blk_execute_rq(vblk->disk->queue, vblk->disk, req, false);

	blk_put_request(req);

drivers/ide/ide-atapi.c

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, 
	int error;



	rq = blk_get_request(drive->queue, READ, __GFP_WAIT);

	rq->cmd_type = REQ_TYPE_SPECIAL;

	rq->cmd_type = REQ_TYPE_DRV_PRIV;

	rq->special = (char *)pc;



	if (buf && bufflen) {
@@ -477,7 +477,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) 
		if (uptodate == 0)

			drive->failed_pc = NULL;



		if (rq->cmd_type == REQ_TYPE_SPECIAL) {

		if (rq->cmd_type == REQ_TYPE_DRV_PRIV) {

			rq->errors = 0;

			error = 0;

		} else {