1 files changed, 3 insertions, 4 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index e48a630ae266..67fe72ce6ac7 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -534,7 +534,6 @@ void __init bdev_cache_init(void)
         if (err)
                 panic("Cannot register bdev pseudo-fs");
         bd_mnt = kern_mount(&bd_type);
-        err = PTR_ERR(bd_mnt);
         if (IS_ERR(bd_mnt))
                 panic("Cannot create bdev pseudo-fs");
         blockdev_superblock = bd_mnt->mnt_sb;   /* For writeback */
@@ -1398,19 +1397,19 @@ struct block_device *lookup_bdev(const char *path)
         if (error)
                 return ERR_PTR(error);
 
-        inode = nd.dentry->d_inode;
+        inode = nd.path.dentry->d_inode;
         error = -ENOTBLK;
         if (!S_ISBLK(inode->i_mode))
                 goto fail;
         error = -EACCES;
-        if (nd.mnt->mnt_flags & MNT_NODEV)
+        if (nd.path.mnt->mnt_flags & MNT_NODEV)
                 goto fail;
         error = -ENOMEM;
         bdev = bd_acquire(inode);
         if (!bdev)
                 goto fail;
 out:
-        path_release(&nd);
+        path_put(&nd.path);
         return bdev;
 fail:
         bdev = ERR_PTR(error);