| From 840d1b50d9b7a348cbdd442df98ecdc14e7cffd8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 30 Apr 2019 22:02:25 +0800 |
| Subject: bcache: remove redundant LIST_HEAD(journal) from run_cache_set() |
| |
| From: Coly Li <colyli@suse.de> |
| |
| [ Upstream commit cdca22bcbc64fc83dadb8d927df400a8d86ddabb ] |
| |
| Commit 95f18c9d1310 ("bcache: avoid potential memleak of list of |
| journal_replay(s) in the CACHE_SYNC branch of run_cache_set") forgets |
| to remove the original define of LIST_HEAD(journal), which makes |
| the change no take effect. This patch removes redundant variable |
| LIST_HEAD(journal) from run_cache_set(), to make Shenghui's fix |
| working. |
| |
| Fixes: 95f18c9d1310 ("bcache: avoid potential memleak of list of journal_replay(s) in the CACHE_SYNC branch of run_cache_set") |
| Reported-by: Juha Aatrokoski <juha.aatrokoski@aalto.fi> |
| Cc: Shenghui Wang <shhuiw@foxmail.com> |
| Signed-off-by: Coly Li <colyli@suse.de> |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/md/bcache/super.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c |
| index e6c7a84bb1dfd..2321643974dab 100644 |
| --- a/drivers/md/bcache/super.c |
| +++ b/drivers/md/bcache/super.c |
| @@ -1768,7 +1768,6 @@ static int run_cache_set(struct cache_set *c) |
| set_gc_sectors(c); |
| |
| if (CACHE_SYNC(&c->sb)) { |
| - LIST_HEAD(journal); |
| struct bkey *k; |
| struct jset *j; |
| |
| -- |
| 2.20.1 |
| |
