rebase patches on top of Ubuntu-5.15.0-41.44

[pve-kernel.git] / patches / kernel / 0009-blk-cgroup-always-terminate-io.stat-lines.patch

diff --git a/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch b/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch
index 8e58480318674fd80dfa994bb4a30e8f0fb76781..dc50e88e04d43368dda2a5aa82566a2e21de4907 100644 (file)
--- a/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch
+++ b/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch
@@ -64,10 +64,10 @@ index 07a2524e6efd..fd09c20a5543 100644
  
  static int blkcg_print_stat(struct seq_file *sf, void *v)
 diff --git a/block/blk-iocost.c b/block/blk-iocost.c
-index eb7b0d6bd11f..381c28f9561e 100644
+index 10851493940c..21db328c0bcc 100644
 --- a/block/blk-iocost.c
 +++ b/block/blk-iocost.c
-@@ -2995,13 +2995,13 @@ static void ioc_pd_free(struct blkg_policy_data *pd)
+@@ -3005,13 +3005,13 @@ static void ioc_pd_free(struct blkg_policy_data *pd)
        kfree(iocg);
  }
  
@@ -83,7 +83,7 @@ index eb7b0d6bd11f..381c28f9561e 100644
  
        if (iocg->level == 0) {
                unsigned vp10k = DIV64_U64_ROUND_CLOSEST(
-@@ -3017,7 +3017,6 @@ static bool ioc_pd_stat(struct blkg_policy_data *pd, struct seq_file *s)
+@@ -3027,7 +3027,6 @@ static bool ioc_pd_stat(struct blkg_policy_data *pd, struct seq_file *s)
                        iocg->last_stat.wait_us,
                        iocg->last_stat.indebt_us,
                        iocg->last_stat.indelay_us);