Commit c00895ab authored by Jens Axboe's avatar Jens Axboe
Browse files

[PATCH] Remove ->waiting member from struct request 



As the comments indicates in blkdev.h, we can fold it into ->end_io_data
usage as that is really what ->waiting is. Fixup the users of
blk_end_sync_rq().

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8a8e674c

block/elevator.c

+1 −2
Original line number Diff line number Diff line
@@ -67,8 +67,7 @@ inline int elv_rq_merge_ok(struct request *rq, struct bio *bio) 
	/*

	 * same device and no special stuff set, merge is ok

	 */

	if (rq->rq_disk == bio->bi_bdev->bd_disk &&

	    !rq->waiting && !rq->special)

	if (rq->rq_disk == bio->bi_bdev->bd_disk && !rq->special)

		return 1;



	return 0;

block/ll_rw_blk.c

+6 −7
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ static inline void rq_init(request_queue_t *q, struct request *rq) 
	rq->buffer = NULL;

	rq->ref_count = 1;

	rq->q = q;

	rq->waiting = NULL;

	rq->special = NULL;

	rq->data_len = 0;

	rq->data = NULL;
@@ -451,6 +450,7 @@ static void queue_flush(request_queue_t *q, unsigned which) 
	rq->cmd_flags = REQ_HARDBARRIER;

	rq_init(q, rq);

	rq->elevator_private = NULL;

	rq->elevator_private2 = NULL;

	rq->rq_disk = q->bar_rq.rq_disk;

	rq->rl = NULL;

	rq->end_io = end_io;
@@ -479,6 +479,7 @@ static inline struct request *start_ordered(request_queue_t *q, 
		rq->cmd_flags |= REQ_RW;

	rq->cmd_flags |= q->ordered & QUEUE_ORDERED_FUA ? REQ_FUA : 0;

	rq->elevator_private = NULL;

	rq->elevator_private2 = NULL;

	rq->rl = NULL;

	init_request_from_bio(rq, q->orig_bar_rq->bio);

	rq->end_io = bar_end_io;
@@ -2569,10 +2570,9 @@ int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk, 
		rq->sense_len = 0;

	}



	rq->waiting = &wait;

	rq->end_io_data = &wait;

	blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq);

	wait_for_completion(&wait);

	rq->waiting = NULL;



	if (rq->errors)

		err = -EIO;
@@ -2736,9 +2736,9 @@ EXPORT_SYMBOL(blk_put_request); 
 */

void blk_end_sync_rq(struct request *rq, int error)

{

	struct completion *waiting = rq->waiting;

	struct completion *waiting = rq->end_io_data;



	rq->waiting = NULL;

	rq->end_io_data = NULL;

	__blk_put_request(rq->q, rq);



	/*
@@ -2801,7 +2801,7 @@ static int attempt_merge(request_queue_t *q, struct request *req, 


	if (rq_data_dir(req) != rq_data_dir(next)

	    || req->rq_disk != next->rq_disk

	    || next->waiting || next->special)

	    || next->special)

		return 0;



	/*
@@ -2886,7 +2886,6 @@ static void init_request_from_bio(struct request *req, struct bio *bio) 
	req->nr_phys_segments = bio_phys_segments(req->q, bio);

	req->nr_hw_segments = bio_hw_segments(req->q, bio);

	req->buffer = bio_data(bio);	/* see ->buffer comment above */

	req->waiting = NULL;

	req->bio = req->biotail = bio;

	req->ioprio = bio_prio(bio);

	req->rq_disk = bio->bi_bdev->bd_disk;

drivers/block/DAC960.c

+1 −1
Original line number Diff line number Diff line
@@ -3331,7 +3331,7 @@ static int DAC960_process_queue(DAC960_Controller_T *Controller, struct request_ 
		Command->DmaDirection = PCI_DMA_TODEVICE;

		Command->CommandType = DAC960_WriteCommand;

	}

	Command->Completion = Request->waiting;

	Command->Completion = Request->end_io_data;

	Command->LogicalDriveNumber = (long)Request->rq_disk->private_data;

	Command->BlockNumber = Request->sector;

	Command->BlockCount = Request->nr_sectors;

drivers/block/paride/pd.c

+1 −2
Original line number Diff line number Diff line
@@ -722,11 +722,10 @@ static int pd_special_command(struct pd_unit *disk, 
	rq.rq_status = RQ_ACTIVE;

	rq.rq_disk = disk->gd;

	rq.ref_count = 1;

	rq.waiting = &wait;

	rq.end_io_data = &wait;

	rq.end_io = blk_end_sync_rq;

	blk_insert_request(disk->gd->queue, &rq, 0, func);

	wait_for_completion(&wait);

	rq.waiting = NULL;

	if (rq.errors)

		err = -EIO;

	blk_put_request(&rq);

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * 
	rq->cmd_len = COMMAND_SIZE(rq->cmd[0]);



	rq->ref_count++;

	rq->waiting = &wait;

	rq->end_io_data = &wait;

	rq->end_io = blk_end_sync_rq;

	elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 1);

	generic_unplug_device(q);