From e7fee8de57c5d9b1ae0c66097f1c8cf11228f4ba Mon Sep 17 00:00:00 2001 From: Nikita Danilov Date: Tue, 6 Sep 2005 15:17:20 -0700 Subject: [PATCH] --- yaml --- r: 7373 b: refs/heads/master c: 4b0dc07e66ade18e0209331afbd16b3de8384f5c h: refs/heads/master i: 7371: d86bc17d12c84e57cba43fbeebc091508be1f439 v: v3 --- [refs] | 2 +- trunk/drivers/block/deadline-iosched.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 7f0105513a69..b135866f10a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffdfc40976dda18d923cd001d44bf0ee55da1af4 +refs/heads/master: 4b0dc07e66ade18e0209331afbd16b3de8384f5c diff --git a/trunk/drivers/block/deadline-iosched.c b/trunk/drivers/block/deadline-iosched.c index ff5201e02153..24594c57c323 100644 --- a/trunk/drivers/block/deadline-iosched.c +++ b/trunk/drivers/block/deadline-iosched.c @@ -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; }