On 2019/2/7 8:10 下午, Shenghui Wang wrote:
> In the CACHE_SYNC branch of run_cache_set(), LIST_HEAD(journal) is used
> to collect journal_replay(s) and filled by bch_journal_read().
>
> If all goes well, bch_journal_replay() will release the list of
> jounal_replay(s) at the end of the branch.
>
> If something goes wrong, code flow will jump to the label "err:" and leave
> the list unreleased.
>
> This patch will release the list of journal_replay(s) in the case of
> error detected.
>
> v1 -> v2:
> * Move the release code to the location after label 'err:' to
> simply the change.
>
> Signed-off-by: Shenghui Wang <shhuiw@xxxxxxxxxxx>
Hi Shenghui,
This patch is good to me. My v5.1 test starts already, so I will have
this one in my for-test directory.
Thanks.
Coly Li
> ---
> drivers/md/bcache/super.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index 4dee119c3664..9d5585948f20 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -1782,6 +1782,8 @@ static void run_cache_set(struct cache_set *c)
> struct cache *ca;
> struct closure cl;
> unsigned int i;
> + LIST_HEAD(journal);
> + struct journal_replay *l;
>
> closure_init_stack(&cl);
>
> @@ -1790,7 +1792,6 @@ static void 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;
>
> @@ -1939,6 +1940,11 @@ static void run_cache_set(struct cache_set *c)
> set_bit(CACHE_SET_RUNNING, &c->flags);
> return;
> err:
> + while (!list_empty(&journal)) {
> + l = list_first_entry(&journal, struct journal_replay, list);
> + list_del(&l->list);
> + kfree(l);
> + }
> closure_sync(&cl);
> /* XXX: test this, it's broken */
> bch_cache_set_error(c, "%s", err);
>
--
Coly Li
