blocklayout: fix blocklayoutdev.c for new blkdev_get_by_dev()

PATCH New Jim Rees 1 participant 1 message Jan 21, 2011

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Jim Rees

author

2011-01-21 20:42 UTC #0 lore raw

PATCH 1/1 blocklayout: fix blocklayoutdev.c for new blkdev_get_by_dev()

blkdev_get has been replaced by blkdev_get_by_dev, which now handles exclusive use too (which we don't use). Fix uses in blocklayout to match.

Signed-off-by Jim Rees <[email protected]>

---
 fs/nfs/blocklayout/blocklayoutdev.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

fs/nfs/blocklayout/blocklayoutdev.c +1 -2

index 17bd25a..23469e3 100644
@@ -55,7 +55,7 @@ struct block_device *nfs4_blkdev_get(dev_t dev)
 	struct block_device *bd;
 
 	dprintk("%s enter\n", __func__);
-	bd = open_by_devnum(dev, FMODE_READ);
+	bd = blkdev_get_by_dev(dev, FMODE_READ, NULL);
 	if (IS_ERR(bd))
 		goto fail;
 	return bd;

@@ -72,7 +72,6 @@ int nfs4_blkdev_put(struct block_device *bdev)
 {
 	dprintk("%s for device %d:%d\n", __func__, MAJOR(bdev->bd_dev),
 			MINOR(bdev->bd_dev));
-	bd_release(bdev);
 	return blkdev_put(bdev, FMODE_READ);
 }

Signature · 1 line

1.7.1