Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm

15cc9101 · Linus Torvalds <[email protected]> · 2011-10-24 07:05:38 +02:00

* 'for-linus' of http://people.redhat.com/agk/git/linux-dm:
  dm kcopyd: fix job_pool leak

Merge commit. Changes below are compared with the first parent: 8548c84d.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/md/dm-kcopyd.c	modified	+1	−0	View file

diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index f821470..32ac708 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);
 