summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-24 07:05:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-24 07:05:38 +0200
commit15cc91011246fa67f755eb3feea08d57a7692fde (patch)
tree8f6e9ce27337923ff688ed99a7c6d0dcac01a91f
parent8548c84da2f47e71bbbe300f55edb768492575f7 (diff)
parentd136f2efdf3a4faba47f58603f8ace2207234d75 (diff)
downloadlinux-3.10-15cc91011246fa67f755eb3feea08d57a7692fde.tar.gz
linux-3.10-15cc91011246fa67f755eb3feea08d57a7692fde.tar.bz2
linux-3.10-15cc91011246fa67f755eb3feea08d57a7692fde.zip
Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm
* 'for-linus' of http://people.redhat.com/agk/git/linux-dm: dm kcopyd: fix job_pool leak
-rw-r--r--drivers/md/dm-kcopyd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index f8214702963..32ac70861d6 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);