]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
dm kcopyd: fix job_pool leak
authorAlasdair G Kergon <agk@redhat.com>
Sun, 23 Oct 2011 19:55:17 +0000 (20:55 +0100)
committerAlasdair G Kergon <agk@redhat.com>
Sun, 23 Oct 2011 19:55:17 +0000 (20:55 +0100)
Fix memory leak introduced by commit a6e50b409d3f9e0833e69c3c9cca822e8fa4adbb
(dm snapshot: skip reading origin when overwriting complete chunk).

When allocating a set of jobs from kc->job_pool, job->master_job must be
set (to point to itself) so that the mempool item gets freed when the
master_job completes.

master_job was introduced by commit c6ea41fbbe08f270a8edef99dc369faf809d1bd6
(dm kcopyd: preallocate sub jobs to avoid deadlock)

Reported-by: Michael Leun <ml@newton.leun.net>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
drivers/md/dm-kcopyd.c

index f82147029636d87b30e990daa230dfb17ca69c50..32ac70861d66c9827518f723b2b1d8d4138493f9 100644 (file)
@@ -628,6 +628,7 @@ void *dm_kcopyd_prepare_callback(struct dm_kcopyd_client *kc,
        job->kc = kc;
        job->fn = fn;
        job->context = context;
+       job->master_job = job;
 
        atomic_inc(&kc->nr_jobs);