From: Andrew Jones <drjones@redhat.com>
Date: Thu, 16 Feb 2012 12:16:25 +0000 (+0100)
Subject: xen/blkfront: don't put bdev right after getting it
X-Git-Tag: v2.6.39-400.9.0~543^2~17^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ba5446cd971668078afd5c082087c109145f045;p=users%2Fjedix%2Flinux-maple.git

xen/blkfront: don't put bdev right after getting it

We should hang onto bdev until we're done with it.

[upstream git commit dad5cf6]
Signed-off-by: Andrew Jones <drjones@redhat.com>
[v1: Fixed up git commit description]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index cdf2d0de21e4..805132ae7481 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1409,7 +1409,6 @@ static int blkif_release(struct gendisk *disk, fmode_t mode)
 	mutex_lock(&blkfront_mutex);
 
 	bdev = bdget_disk(disk, 0);
-	bdput(bdev);
 
 	if (bdev->bd_openers)
 		goto out;
@@ -1440,6 +1439,7 @@ static int blkif_release(struct gendisk *disk, fmode_t mode)
 	}
 
 out:
+	bdput(bdev);
 	mutex_unlock(&blkfront_mutex);
 	return 0;
 }