new helper: file_inode(file)

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

4 files changed, 9 insertions, 9 deletions

diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 911704571b9c..5acdc5f7dae8 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -433,9 +433,9 @@ fs3270_open(struct inode *inode, struct file *filp)
         struct idal_buffer *ib;
         int minor, rc = 0;
 
-        if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
+        if (imajor(file_inode(filp)) != IBM_FS3270_MAJOR)
                 return -ENODEV;
-        minor = iminor(filp->f_path.dentry->d_inode);
+        minor = iminor(file_inode(filp));
         /* Check for minor 0 multiplexer. */
         if (minor == 0) {
                 struct tty_struct *tty = get_current_tty();
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 2d61db3fc62a..6dc60725de92 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -273,13 +273,13 @@ tapechar_open (struct inode *inode, struct file *filp)
         int minor, rc;
 
         DBF_EVENT(6, "TCHAR:open: %i:%i\n",
-                imajor(filp->f_path.dentry->d_inode),
-                iminor(filp->f_path.dentry->d_inode));
+                imajor(file_inode(filp)),
+                iminor(file_inode(filp)));
 
-        if (imajor(filp->f_path.dentry->d_inode) != tapechar_major)
+        if (imajor(file_inode(filp)) != tapechar_major)
                 return -ENODEV;
 
-        minor = iminor(filp->f_path.dentry->d_inode);
+        minor = iminor(file_inode(filp));
         device = tape_find_device(minor / TAPE_MINORS_PER_DEV);
         if (IS_ERR(device)) {
                 DBF_EVENT(3, "TCHAR:open: tape_find_device() failed\n");
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 483f72ba030d..c180e3135b3b 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -703,7 +703,7 @@ static int ur_open(struct inode *inode, struct file *file)
          * We treat the minor number as the devno of the ur device
          * to find in the driver tree.
          */
-        devno = MINOR(file->f_dentry->d_inode->i_rdev);
+        devno = MINOR(file_inode(file)->i_rdev);
 
         urd = urdev_get_from_devno(devno);
         if (!urd) {
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index e6e0d31c02ac..749b72739c4a 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -128,7 +128,7 @@ static int qstat_show(struct seq_file *m, void *v)
 static int qstat_seq_open(struct inode *inode, struct file *filp)
 {
         return single_open(filp, qstat_show,
-                           filp->f_path.dentry->d_inode->i_private);
+                           file_inode(filp)->i_private);
 }
 
 static const struct file_operations debugfs_fops = {
@@ -221,7 +221,7 @@ static ssize_t qperf_seq_write(struct file *file, const char __user *ubuf,
 static int qperf_seq_open(struct inode *inode, struct file *filp)
 {
         return single_open(filp, qperf_show,
-                           filp->f_path.dentry->d_inode->i_private);
+                           file_inode(filp)->i_private);
 }
 
 static struct file_operations debugfs_perf_fops = {