---

yaml --- r: 309304 b: refs/heads/master c: 4a2fe56 h: refs/heads/master v: v3
git-mirror · May 9, 2012 · 7251d16 · 7251d16
1 parent 5886ce5
commit 7251d16
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c464425158482647226fb30708c68fffc061585
+refs/heads/master: 4a2fe568b5428abc56d7d172e3571e33d8ab7265
diff --git a/trunk/drivers/block/drbd/drbd_actlog.c b/trunk/drivers/block/drbd/drbd_actlog.c
@@ -118,6 +118,7 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev,
 	bio->bi_end_io = drbd_md_io_complete;
 	bio->bi_rw = rw;
 
+	bio_get(bio); /* one bio_put() is in the completion handler */
 	atomic_inc(&mdev->md_io_in_use); /* drbd_md_put_buffer() is in the completion handler */
 	if (drbd_insert_fault(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD))
 		bio_endio(bio, -EIO);

diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c
@@ -79,6 +79,7 @@ void drbd_md_io_complete(struct bio *bio, int error)
 
 	md_io->done = 1;
 	wake_up(&mdev->misc_wait);
+	bio_put(bio);
 	drbd_md_put_buffer(mdev);
 }