From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 11 Mar 2020 18:07:10 +0000 (+0100)
Subject: 5.5-stable patches
X-Git-Tag: v5.5.9~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f492732cf8d54cdea2419b952f6fce9e315abb1c;p=thirdparty%2Fkernel%2Fstable-queue.git

5.5-stable patches

added patches:
	block-bfq-remove-ifdefs-from-around-gets-puts-of-bfq-groups.patch
---

diff --git a/queue-5.5/block-bfq-remove-ifdefs-from-around-gets-puts-of-bfq-groups.patch b/queue-5.5/block-bfq-remove-ifdefs-from-around-gets-puts-of-bfq-groups.patch
new file mode 100644
index 00000000000..bf767aeee67
--- /dev/null
+++ b/queue-5.5/block-bfq-remove-ifdefs-from-around-gets-puts-of-bfq-groups.patch
@@ -0,0 +1,80 @@
+From 4d8340d0d4d90e7ca367d18ec16c2fefa89a339c Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@linaro.org>
+Date: Mon, 3 Feb 2020 11:40:58 +0100
+Subject: block, bfq: remove ifdefs from around gets/puts of bfq groups
+
+From: Paolo Valente <paolo.valente@linaro.org>
+
+commit 4d8340d0d4d90e7ca367d18ec16c2fefa89a339c upstream.
+
+ifdefs around gets and puts of bfq groups reduce readability, remove them.
+
+Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+Reported-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ block/bfq-cgroup.c  |    4 ++++
+ block/bfq-iosched.c |    6 +-----
+ block/bfq-iosched.h |    1 +
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+--- a/block/bfq-cgroup.c
++++ b/block/bfq-cgroup.c
+@@ -1406,6 +1406,10 @@ struct bfq_group *bfqq_group(struct bfq_
+ 	return bfqq->bfqd->root_group;
+ }
+ 
++void bfqg_and_blkg_get(struct bfq_group *bfqg) {}
++
++void bfqg_and_blkg_put(struct bfq_group *bfqg) {}
++
+ struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
+ {
+ 	struct bfq_group *bfqg;
+--- a/block/bfq-iosched.c
++++ b/block/bfq-iosched.c
+@@ -4826,9 +4826,7 @@ void bfq_put_queue(struct bfq_queue *bfq
+ {
+ 	struct bfq_queue *item;
+ 	struct hlist_node *n;
+-#ifdef CONFIG_BFQ_GROUP_IOSCHED
+ 	struct bfq_group *bfqg = bfqq_group(bfqq);
+-#endif
+ 
+ 	if (bfqq->bfqd)
+ 		bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d",
+@@ -4901,9 +4899,7 @@ void bfq_put_queue(struct bfq_queue *bfq
+ 		bfqq->bfqd->last_completed_rq_bfqq = NULL;
+ 
+ 	kmem_cache_free(bfq_pool, bfqq);
+-#ifdef CONFIG_BFQ_GROUP_IOSCHED
+ 	bfqg_and_blkg_put(bfqg);
+-#endif
+ }
+ 
+ static void bfq_put_cooperator(struct bfq_queue *bfqq)
+@@ -6391,10 +6387,10 @@ static void bfq_exit_queue(struct elevat
+ 
+ 	hrtimer_cancel(&bfqd->idle_slice_timer);
+ 
+-#ifdef CONFIG_BFQ_GROUP_IOSCHED
+ 	/* release oom-queue reference to root group */
+ 	bfqg_and_blkg_put(bfqd->root_group);
+ 
++#ifdef CONFIG_BFQ_GROUP_IOSCHED
+ 	blkcg_deactivate_policy(bfqd->queue, &blkcg_policy_bfq);
+ #else
+ 	spin_lock_irq(&bfqd->lock);
+--- a/block/bfq-iosched.h
++++ b/block/bfq-iosched.h
+@@ -921,6 +921,7 @@ struct bfq_group {
+ 
+ #else
+ struct bfq_group {
++	struct bfq_entity entity;
+ 	struct bfq_sched_data sched_data;
+ 
+ 	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
diff --git a/queue-5.5/series b/queue-5.5/series
index d0be9772dfe..a4a769a1766 100644
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -186,3 +186,4 @@ efi-x86-align-guids-to-their-size-in-the-mixed-mode-runtime-wrapper.patch
 efi-x86-handle-by-ref-arguments-covering-multiple-pages-in-mixed-mode.patch
 efi-read_once-rng-seed-size-before-munmap.patch
 net-stmmac-fix-notifier-registration.patch
+block-bfq-remove-ifdefs-from-around-gets-puts-of-bfq-groups.patch