mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
60 lines
1.5 KiB
Diff
60 lines
1.5 KiB
Diff
|
From 994451c7668678f1bf3ec86345bef1c1d549ba45 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Arianna Avanzini <avanzini.arianna@gmail.com>
|
||
|
|
Date: Wed, 24 Jul 2013 21:43:47 +0200
|
||
|
|
Subject: [PATCH] block: Switch from BFQ-v6r2 for 3.10.0 to BFQ-v6r2 for
|
||
|
|
3.10.8-rc1.
|
||
|
|
|
||
|
|
---
|
||
|
|
block/bfq-iosched.c | 18 +++++++++++++++---
|
||
|
|
1 file changed, 15 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
|
||
|
|
index bc57923..bbe79fb 100644
|
||
|
|
--- a/block/bfq-iosched.c
|
||
|
|
+++ b/block/bfq-iosched.c
|
||
|
|
@@ -2930,14 +2930,22 @@ static void bfq_exit_queue(struct elevator_queue *e)
|
||
|
|
kfree(bfqd);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int bfq_init_queue(struct request_queue *q)
|
||
|
|
+static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
|
||
|
|
{
|
||
|
|
struct bfq_group *bfqg;
|
||
|
|
struct bfq_data *bfqd;
|
||
|
|
+ struct elevator_queue *eq;
|
||
|
|
+
|
||
|
|
+ eq = elevator_alloc(q, e);
|
||
|
|
+ if (eq == NULL)
|
||
|
|
+ return -ENOMEM;
|
||
|
|
|
||
|
|
bfqd = kmalloc_node(sizeof(*bfqd), GFP_KERNEL | __GFP_ZERO, q->node);
|
||
|
|
- if (bfqd == NULL)
|
||
|
|
+ if (bfqd == NULL) {
|
||
|
|
+ kobject_put(&eq->kobj);
|
||
|
|
return -ENOMEM;
|
||
|
|
+ }
|
||
|
|
+ eq->elevator_data = bfqd;
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues.
|
||
|
|
@@ -2948,11 +2956,15 @@ static int bfq_init_queue(struct request_queue *q)
|
||
|
|
atomic_inc(&bfqd->oom_bfqq.ref);
|
||
|
|
|
||
|
|
bfqd->queue = q;
|
||
|
|
- q->elevator->elevator_data = bfqd;
|
||
|
|
+
|
||
|
|
+ spin_lock_irq(q->queue_lock);
|
||
|
|
+ q->elevator = eq;
|
||
|
|
+ spin_unlock_irq(q->queue_lock);
|
||
|
|
|
||
|
|
bfqg = bfq_alloc_root_group(bfqd, q->node);
|
||
|
|
if (bfqg == NULL) {
|
||
|
|
kfree(bfqd);
|
||
|
|
+ kobject_put(&eq->kobj);
|
||
|
|
return -ENOMEM;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.1.4
|
||
|
|
|