diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 | 
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 | 
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /drivers/md/md.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/drivers/md/md.c b/drivers/md/md.c index 2fe32c261922..e4e161372a3e 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1404,7 +1404,7 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev)  	struct block_device *bdev;  	char b[BDEVNAME_SIZE]; -	bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE); +	bdev = open_partition_by_devnum(dev, FMODE_READ|FMODE_WRITE);  	if (IS_ERR(bdev)) {  		printk(KERN_ERR "md: could not open %s.\n",  			__bdevname(dev, b)); @@ -1414,7 +1414,7 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev)  	if (err) {  		printk(KERN_ERR "md: could not bd_claim %s.\n",  			bdevname(bdev, b)); -		blkdev_put(bdev); +		blkdev_put_partition(bdev);  		return err;  	}  	rdev->bdev = bdev; @@ -1428,7 +1428,7 @@ static void unlock_rdev(mdk_rdev_t *rdev)  	if (!bdev)  		MD_BUG();  	bd_release(bdev); -	blkdev_put(bdev); +	blkdev_put_partition(bdev);  }  void md_autodetect_dev(dev_t dev); | 
