7 files changed, 10 insertions, 10 deletions

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 766ec35f988e..681a8537b64f 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -123,7 +123,7 @@ static int __dcache_readdir(struct file *file,  struct dir_context *ctx,
                             u32 shared_gen)
 {
         struct ceph_file_info *fi = file->private_data;
-        struct dentry *parent = file->f_dentry;
+        struct dentry *parent = file->f_path.dentry;
         struct inode *dir = parent->d_inode;
         struct list_head *p;
         struct dentry *dentry, *last;
@@ -274,7 +274,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
                 off = 1;
         }
         if (ctx->pos == 1) {
-                ino_t ino = parent_ino(file->f_dentry);
+                ino_t ino = parent_ino(file->f_path.dentry);
                 dout("readdir off 1 -> '..'\n");
                 if (!dir_emit(ctx, "..", 2,
                             ceph_translate_ino(inode->i_sb, ino),
@@ -337,7 +337,7 @@ more:
                 }
                 req->r_inode = inode;
                 ihold(inode);
-                req->r_dentry = dget(file->f_dentry);
+                req->r_dentry = dget(file->f_path.dentry);
                 /* hints to request -> mds selection code */
                 req->r_direct_mode = USE_AUTH_MDS;
                 req->r_direct_hash = ceph_frag_value(frag);
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index db2c967950f7..9f8e3572040e 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -211,7 +211,7 @@ int ceph_open(struct inode *inode, struct file *file)
 
         req->r_num_caps = 1;
         if (flags & O_CREAT)
-                parent_inode = ceph_get_dentry_parent_inode(file->f_dentry);
+                parent_inode = ceph_get_dentry_parent_inode(file->f_path.dentry);
         err = ceph_mdsc_do_request(mdsc, parent_inode, req);
         iput(parent_inode);
         if (!err)
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index d19f1996a6ea..d116ca8ce4c0 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -753,7 +753,7 @@ static int cifs_filldir(char *find_entry, struct file *file,
                  */
                 fattr.cf_flags |= CIFS_FATTR_NEED_REVAL;
 
-        cifs_prime_dcache(file->f_dentry, &name, &fattr);
+        cifs_prime_dcache(file->f_path.dentry, &name, &fattr);
 
         ino = cifs_uniqueid_to_ino_t(fattr.cf_uniqueid);
         return !dir_emit(ctx, name.name, name.len, ino, fattr.cf_dtype);
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 2f6735dbf1a9..c2d6604667b0 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1373,7 +1373,7 @@ out:
 int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode)
 {
         struct dentry *lower_dentry =
-                ecryptfs_inode_to_private(ecryptfs_inode)->lower_file->f_dentry;
+                ecryptfs_inode_to_private(ecryptfs_inode)->lower_file->f_path.dentry;
         ssize_t size;
         int rc = 0;
 
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 564a1fa34b99..4626976794e7 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -419,7 +419,7 @@ static int ecryptfs_write_inode_size_to_xattr(struct inode *ecryptfs_inode)
         ssize_t size;
         void *xattr_virt;
         struct dentry *lower_dentry =
-                ecryptfs_inode_to_private(ecryptfs_inode)->lower_file->f_dentry;
+                ecryptfs_inode_to_private(ecryptfs_inode)->lower_file->f_path.dentry;
         struct inode *lower_inode = lower_dentry->d_inode;
         int rc;
 
diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c
index cdb2971192a5..90001da9abfd 100644
--- a/fs/efivarfs/file.c
+++ b/fs/efivarfs/file.c
@@ -47,8 +47,8 @@ static ssize_t efivarfs_file_write(struct file *file,
 
         if (bytes == -ENOENT) {
                 drop_nlink(inode);
-                d_delete(file->f_dentry);
-                dput(file->f_dentry);
+                d_delete(file->f_path.dentry);
+                dput(file->f_path.dentry);
         } else {
                 mutex_lock(&inode->i_mutex);
                 i_size_write(inode, datasize + sizeof(attributes));
diff --git a/fs/sync.c b/fs/sync.c
index bdc729d80e5e..01d9f18a70b5 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -154,7 +154,7 @@ SYSCALL_DEFINE1(syncfs, int, fd)
 
         if (!f.file)
                 return -EBADF;
-        sb = f.file->f_dentry->d_sb;
+        sb = f.file->f_path.dentry->d_sb;
 
         down_read(&sb->s_umount);
         ret = sync_filesystem(sb);