Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / staging / lustre / lustre / llite / lloop.c

diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index b6325c01890bc4d4b194acf8b0b27b9a42aff8b0..031248840642a5dc3d40d6d3b03c1f589db4f625 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -187,7 +187,7 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)
 {
        const struct lu_env  *env   = lo->lo_env;
        struct cl_io     *io    = &lo->lo_io;
-       struct inode     *inode = lo->lo_backing_file->f_dentry->d_inode;
+       struct inode     *inode = file_inode(lo->lo_backing_file);
        struct cl_object     *obj = ll_i2info(inode)->lli_clob;
        pgoff_t        offset;
        int                ret;
@@ -626,7 +626,7 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,
                        break;
                }
                if (inode == NULL)
-                       inode = lo->lo_backing_file->f_dentry->d_inode;
+                       inode = file_inode(lo->lo_backing_file);
                if (lo->lo_state == LLOOP_BOUND)
                        fid = ll_i2info(inode)->lli_fid;
                else
@@ -692,8 +692,7 @@ static enum llioc_iter lloop_ioctl(struct inode *unused, struct file *file,
                                        lo_free = lo;
                                continue;
                        }
-                       if (lo->lo_backing_file->f_dentry->d_inode ==
-                           file->f_dentry->d_inode)
+                       if (file_inode(lo->lo_backing_file) == file_inode(file))
                                break;
                }
                if (lo || !lo_free) {