new helper: file_inode(file)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

4 files changed, 5 insertions, 5 deletions

diff --git a/arch/s390/hypfs/hypfs_dbfs.c b/arch/s390/hypfs/hypfs_dbfs.c
index 13e76dabbe8b..9fd4a40c6752 100644
--- a/arch/s390/hypfs/hypfs_dbfs.c
+++ b/arch/s390/hypfs/hypfs_dbfs.c
@@ -54,7 +54,7 @@ static ssize_t dbfs_read(struct file *file, char __user *buf,
         if (*ppos != 0)
                 return 0;
 
-        df = file->f_path.dentry->d_inode->i_private;
+        df = file_inode(file)->i_private;
         mutex_lock(&df->lock);
         if (!df->data) {
                 data = hypfs_dbfs_data_alloc(df);
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 06ea69bd387a..280ded8b79ba 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -119,7 +119,7 @@ static void hypfs_evict_inode(struct inode *inode)
 
 static int hypfs_open(struct inode *inode, struct file *filp)
 {
-        char *data = filp->f_path.dentry->d_inode->i_private;
+        char *data = file_inode(filp)->i_private;
         struct hypfs_sb_info *fs_info;
 
         if (filp->f_mode & FMODE_WRITE) {
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 4e8215e0d4b6..19dcf136b851 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -611,7 +611,7 @@ debug_open(struct inode *inode, struct file *file)
         debug_info_t *debug_info, *debug_info_snapshot;
 
         mutex_lock(&debug_mutex);
-        debug_info = file->f_path.dentry->d_inode->i_private;
+        debug_info = file_inode(file)->i_private;
         /* find debug view */
         for (i = 0; i < DEBUG_MAX_VIEWS; i++) {
                 if (!debug_info->views[i])
diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index a303c95346cb..a5d07bc2a547 100644
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -99,7 +99,7 @@ static ssize_t pci_perf_seq_write(struct file *file, const char __user *ubuf,
 static int pci_perf_seq_open(struct inode *inode, struct file *filp)
 {
         return single_open(filp, pci_perf_show,
-                           filp->f_path.dentry->d_inode->i_private);
+                           file_inode(filp)->i_private);
 }
 
 static const struct file_operations debugfs_pci_perf_fops = {
@@ -121,7 +121,7 @@ static int pci_debug_show(struct seq_file *m, void *v)
 static int pci_debug_seq_open(struct inode *inode, struct file *filp)
 {
         return single_open(filp, pci_debug_show,
-                           filp->f_path.dentry->d_inode->i_private);
+                           file_inode(filp)->i_private);
 }
 
 static const struct file_operations debugfs_pci_debug_fops = {