From: Jens Axboe <jaxboe@fusionio.com>
Date: Sat, 27 Nov 2010 18:49:18 +0000 (+0100)
Subject: Merge branch 'cleanup-bd_claim' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: upstream/snapshot3+hdmi~11896^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f30195c50245d8ace628e1978b1daa8df86e7224;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'cleanup-bd_claim' of git://git./linux/kernel/git/tj/misc into for-2.6.38/core
---

f30195c50245d8ace628e1978b1daa8df86e7224
diff --cc drivers/block/drbd/drbd_nl.c
index 29e5c70,650e43b..8cbfaa6
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@@ -1267,20 -1235,16 +1240,16 @@@ static int drbd_nl_disk_conf(struct drb
   force_diskless_dec:
  	put_ldev(mdev);
   force_diskless:
 -	drbd_force_state(mdev, NS(disk, D_DISKLESS));
 +	drbd_force_state(mdev, NS(disk, D_FAILED));
  	drbd_md_sync(mdev);
-  release_bdev2_fail:
- 	if (nbc)
- 		bd_release(nbc->md_bdev);
-  release_bdev_fail:
- 	if (nbc)
- 		bd_release(nbc->backing_bdev);
   fail:
  	if (nbc) {
- 		if (nbc->lo_file)
- 			fput(nbc->lo_file);
- 		if (nbc->md_file)
- 			fput(nbc->md_file);
+ 		if (nbc->backing_bdev)
+ 			blkdev_put(nbc->backing_bdev,
+ 				   FMODE_READ | FMODE_WRITE | FMODE_EXCL);
+ 		if (nbc->md_bdev)
+ 			blkdev_put(nbc->md_bdev,
+ 				   FMODE_READ | FMODE_WRITE | FMODE_EXCL);
  		kfree(nbc);
  	}
  	lc_destroy(resync_lru);