1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 6c4345bde07e..53bd46dba0cb 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1413,7 +1413,7 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev)
         struct block_device *bdev;
         char b[BDEVNAME_SIZE];
 
-        bdev = open_partition_by_devnum(dev, FMODE_READ|FMODE_WRITE);
+        bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE);
         if (IS_ERR(bdev)) {
                 printk(KERN_ERR "md: could not open %s.\n",
                         __bdevname(dev, b));
@@ -1423,7 +1423,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_partition(bdev);
+                blkdev_put(bdev);
                 return err;
         }
         rdev->bdev = bdev;
@@ -1437,7 +1437,7 @@ static void unlock_rdev(mdk_rdev_t *rdev)
         if (!bdev)
                 MD_BUG();
         bd_release(bdev);
-        blkdev_put_partition(bdev);
+        blkdev_put(bdev);
 }
 
 void md_autodetect_dev(dev_t dev);
@@ -4423,7 +4423,7 @@ static int md_open(struct inode *inode, struct file *file)
         mddev_t *mddev = inode->i_bdev->bd_disk->private_data;
         int err;
 
-        if ((err = mddev_lock(mddev)))
+        if ((err = mutex_lock_interruptible_nested(&mddev->reconfig_mutex, 1)))
                 goto out;
 
         err = 0;
@@ -4846,8 +4846,8 @@ static int md_seq_show(struct seq_file *seq, void *v)
                                 chunk_kb ? "KB" : "B");
                         if (bitmap->file) {
                                 seq_printf(seq, ", file: ");
-                                seq_path(seq, bitmap->file->f_vfsmnt,
-                                         bitmap->file->f_dentry," \t\n");
+                                seq_path(seq, bitmap->file->f_path.mnt,
+                                         bitmap->file->f_path.dentry," \t\n");
                         }
 
                         seq_printf(seq, "\n");