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

Commit 4b0dc07e authored by Nikita Danilov's avatar Nikita Danilov Committed by Linus Torvalds
Browse files

[PATCH] cleanup of deadline_dispatch_requests() 



cleanup of deadline_dispatch_requests():

- replace drq selection with hopefully clearer while semantically the
  same construct: take write request, if there is any, otherwise take read
  one, or NULL if none exist.

- kill unused other_dir.

Signed-off-by: default avatarNikita Danilov <nikita@clusterfs.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ffdfc409

drivers/block/deadline-iosched.c

+2 −10
Original line number Diff line number Diff line
@@ -507,18 +507,12 @@ static int deadline_dispatch_requests(struct deadline_data *dd) 
	const int reads = !list_empty(&dd->fifo_list[READ]);

	const int writes = !list_empty(&dd->fifo_list[WRITE]);

	struct deadline_rq *drq;

	int data_dir, other_dir;

	int data_dir;



	/*

	 * batches are currently reads XOR writes

	 */

	drq = NULL;



	if (dd->next_drq[READ])

		drq = dd->next_drq[READ];



	if (dd->next_drq[WRITE])

		drq = dd->next_drq[WRITE];

	drq = dd->next_drq[WRITE] ? : dd->next_drq[READ];



	if (drq) {

		/* we have a "next request" */
@@ -544,7 +538,6 @@ static int deadline_dispatch_requests(struct deadline_data *dd) 
			goto dispatch_writes;



		data_dir = READ;

		other_dir = WRITE;



		goto dispatch_find_request;

	}
@@ -560,7 +553,6 @@ static int deadline_dispatch_requests(struct deadline_data *dd) 
		dd->starved = 0;



		data_dir = WRITE;

		other_dir = READ;



		goto dispatch_find_request;

	}