summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2018-07-04 09:51:26 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2018-07-04 09:51:26 -0400
commit669c54b9d6bd1c172e91540d191083f84240d056 (patch)
treed06701f29ca2b9d50eab564d8032902eba2ed9fc
parent17b62a3b679c3699bd7db90fdc15f554f753f247 (diff)
downloadlongterm-queue-4.12-669c54b9d6bd1c172e91540d191083f84240d056.tar.gz
md: refresh for old filenames
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/md-free-unused-memory-after-bitmap-resize.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/md-free-unused-memory-after-bitmap-resize.patch b/queue/md-free-unused-memory-after-bitmap-resize.patch
index 2a35176..a72ee99 100644
--- a/queue/md-free-unused-memory-after-bitmap-resize.patch
+++ b/queue/md-free-unused-memory-after-bitmap-resize.patch
@@ -1,4 +1,4 @@
-From 0868b99c214a3d55486c700de7c3f770b7243e7c Mon Sep 17 00:00:00 2001
+From 5f7f790b3a101adf447bd21934db8715cb6e2899 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Wed, 8 Nov 2017 13:44:56 +0100
Subject: [PATCH] md: free unused memory after bitmap resize
@@ -35,12 +35,13 @@ unreferenced object 0xffff8f4311e9c000 (size 4096):
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Shaohua Li <shli@fb.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
-index a60e46529d9f..bb45c0ccc1bf 100644
---- a/drivers/md/md-bitmap.c
-+++ b/drivers/md/md-bitmap.c
-@@ -2162,6 +2162,7 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
+diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
+index 77ba844c11d6..69341b00ac57 100644
+--- a/drivers/md/bitmap.c
++++ b/drivers/md/bitmap.c
+@@ -2157,6 +2157,7 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
for (k = 0; k < page; k++) {
kfree(new_bp[k].map);
}
@@ -48,7 +49,7 @@ index a60e46529d9f..bb45c0ccc1bf 100644
/* restore some fields from old_counts */
bitmap->counts.bp = old_counts.bp;
-@@ -2212,6 +2213,14 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
+@@ -2207,6 +2208,14 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
block += old_blocks;
}