diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 13:27:55 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 13:27:55 -0400 |
| commit | 59013d3dc2285eecf98016dca78cd50aabdd8069 (patch) | |
| tree | cdc5d95260d189503a90511e4ef0a74cc29eb650 | |
| parent | 0fb3234fa0ae661e282ba1f46670a515bffacc71 (diff) | |
| download | longterm-queue-4.12-59013d3dc2285eecf98016dca78cd50aabdd8069.tar.gz | |
lightnvm: drop patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/lightnvm-pblk-protect-line-bitmap-while-submitting-m.patch | 41 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 42 deletions
diff --git a/queue/lightnvm-pblk-protect-line-bitmap-while-submitting-m.patch b/queue/lightnvm-pblk-protect-line-bitmap-while-submitting-m.patch deleted file mode 100644 index 7aa772c..0000000 --- a/queue/lightnvm-pblk-protect-line-bitmap-while-submitting-m.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e57903fd972a398b7140d0bc055714e13a0e58c5 Mon Sep 17 00:00:00 2001 -From: Rakesh Pandit <rakesh@tuxera.com> -Date: Fri, 13 Oct 2017 14:45:56 +0200 -Subject: [PATCH] lightnvm: pblk: protect line bitmap while submitting meta io -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit e57903fd972a398b7140d0bc055714e13a0e58c5 upstream. - -It seems pblk_dealloc_page would race against pblk_alloc_pages for -line bitmap for sector allocation.The chances are very low but might -as well protect the bitmap properly. - -Signed-off-by: Rakesh Pandit <rakesh@tuxera.com> -Reviewed-by: Javier González <javier@cnexlabs.com> -Signed-off-by: Matias Bjørling <m@bjorling.me> -Signed-off-by: Jens Axboe <axboe@kernel.dk> - -diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c -index 81501644fb15..b53bb00a9918 100644 ---- a/drivers/lightnvm/pblk-core.c -+++ b/drivers/lightnvm/pblk-core.c -@@ -486,12 +486,14 @@ void pblk_dealloc_page(struct pblk *pblk, struct pblk_line *line, int nr_secs) - u64 addr; - int i; - -+ spin_lock(&line->lock); - addr = find_next_zero_bit(line->map_bitmap, - pblk->lm.sec_per_line, line->cur_sec); - line->cur_sec = addr - nr_secs; - - for (i = 0; i < nr_secs; i++, line->cur_sec--) - WARN_ON(!test_and_clear_bit(line->cur_sec, line->map_bitmap)); -+ spin_unlock(&line->lock); - } - - u64 __pblk_alloc_page(struct pblk *pblk, struct pblk_line *line, int nr_secs) --- -2.15.0 - diff --git a/queue/series b/queue/series index b76dce7..d92b50d 100644 --- a/queue/series +++ b/queue/series @@ -112,7 +112,6 @@ icmp-don-t-fail-on-fragment-reassembly-time-exceeded.patch lightnvm-pblk-fix-changing-GC-group-list-for-a-line.patch lightnvm-pblk-initialize-debug-stat-counter.patch lightnvm-pblk-fix-min-size-for-page-mempool.patch -lightnvm-pblk-protect-line-bitmap-while-submitting-m.patch ath9k-fix-tx99-potential-info-leak.patch ath10k-fix-build-errors-with-CONFIG_PM.patch usb-musb-da8xx-fix-babble-condition-handling.patch |