3 files changed, 10 insertions, 10 deletions

diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index a4a6e1463af8..957681c39ad9 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -235,7 +235,7 @@ mmap_subpage (struct file *file, unsigned long start, unsigned long end, int pro
 
         if (!(flags & MAP_ANONYMOUS)) {
                 /* read the file contents */
-                inode = file->f_dentry->d_inode;
+                inode = file->f_path.dentry->d_inode;
                 if (!inode->i_fop || !file->f_op->read
                     || ((*file->f_op->read)(file, (char __user *) start, end - start, &off) < 0))
                 {
@@ -837,7 +837,7 @@ emulate_mmap (struct file *file, unsigned long start, unsigned long len, int pro
 
         if (!is_congruent) {
                 /* read the file contents */
-                inode = file->f_dentry->d_inode;
+                inode = file->f_path.dentry->d_inode;
                 if (!inode->i_fop || !file->f_op->read
                     || ((*file->f_op->read)(file, (char __user *) pstart, pend - pstart, &poff)
                         < 0))
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index dbb28164b19b..aa94f60fa8e7 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2188,13 +2188,13 @@ pfm_alloc_fd(struct file **cfile)
         /*
          * allocate a new dcache entry
          */
-        file->f_dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
-        if (!file->f_dentry) goto out;
+        file->f_path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
+        if (!file->f_path.dentry) goto out;
 
-        file->f_dentry->d_op = &pfmfs_dentry_operations;
+        file->f_path.dentry->d_op = &pfmfs_dentry_operations;
 
-        d_add(file->f_dentry, inode);
-        file->f_vfsmnt = mntget(pfmfs_mnt);
+        d_add(file->f_path.dentry, inode);
+        file->f_path.mnt = mntget(pfmfs_mnt);
         file->f_mapping = inode->i_mapping;
 
         file->f_op    = &pfm_file_ops;
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index fd607ca51a8d..e375a2f0f2c3 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -302,7 +302,7 @@ salinfo_event_open(struct inode *inode, struct file *file)
 static ssize_t
 salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         struct proc_dir_entry *entry = PDE(inode);
         struct salinfo_data *data = entry->data;
         char cmd[32];
@@ -464,7 +464,7 @@ retry:
 static ssize_t
 salinfo_log_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         struct proc_dir_entry *entry = PDE(inode);
         struct salinfo_data *data = entry->data;
         u8 *buf;
@@ -525,7 +525,7 @@ salinfo_log_clear(struct salinfo_data *data, int cpu)
 static ssize_t
 salinfo_log_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         struct proc_dir_entry *entry = PDE(inode);
         struct salinfo_data *data = entry->data;
         char cmd[32];