diff options
| author | Alasdair G Kergon <agk@redhat.com> | 2011-10-23 21:55:17 +0200 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2011-10-23 21:55:17 +0200 |
| commit | d136f2efdf3a4faba47f58603f8ace2207234d75 (patch) | |
| tree | 0b2e94980503cdae7f326219d792d98b10e54a0f /drivers | |
| parent | Linux 3.1-rc10 (diff) | |
| download | linux-d136f2efdf3a4faba47f58603f8ace2207234d75.tar.xz linux-d136f2efdf3a4faba47f58603f8ace2207234d75.zip | |
dm kcopyd: fix job_pool leak
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/dm-kcopyd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c index f82147029636..32ac70861d66 100644 --- a/drivers/md/dm-kcopyd.c +++ b/drivers/md/dm-kcopyd.c @@ -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); |