new helper: file_inode(file)

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

3 files changed, 9 insertions, 10 deletions

diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c
index c4b71710fb0e..a1c498d18d31 100644
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -654,7 +654,7 @@ static int sync_serial_release(struct inode *inode, struct file *file)
 
 static unsigned int sync_serial_poll(struct file *file, poll_table *wait)
 {
-        int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+        int dev = MINOR(file_inode(file)->i_rdev);
         unsigned int mask = 0;
         struct sync_port *port;
         DEBUGPOLL(static unsigned int prev_mask = 0);
@@ -685,7 +685,7 @@ static int sync_serial_ioctl_unlocked(struct file *file,
         int return_val = 0;
         unsigned long flags;
 
-        int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+        int dev = MINOR(file_inode(file)->i_rdev);
         struct sync_port *port;
 
         if (dev < 0 || dev >= NUMBER_OF_PORTS || !ports[dev].enabled) {
@@ -973,7 +973,7 @@ static long sync_serial_ioctl(struct file *file,
 static ssize_t sync_serial_write(struct file *file, const char *buf,
         size_t count, loff_t *ppos)
 {
-        int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+        int dev = MINOR(file_inode(file)->i_rdev);
         DECLARE_WAITQUEUE(wait, current);
         struct sync_port *port;
         unsigned long flags;
@@ -1097,7 +1097,7 @@ static ssize_t sync_serial_write(struct file *file, const char *buf,
 static ssize_t sync_serial_read(struct file *file, char *buf,
                                 size_t count, loff_t *ppos)
 {
-        int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+        int dev = MINOR(file_inode(file)->i_rdev);
         int avail;
         struct sync_port *port;
         unsigned char *start;
diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c
index f8476d9e856b..877da1908234 100644
--- a/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/arch/cris/arch-v32/drivers/cryptocop.c
@@ -3135,11 +3135,10 @@ static long cryptocop_ioctl_unlocked(struct inode *inode,
 static long
 cryptocop_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
-       struct inode *inode = file->f_path.dentry->d_inode;
        long ret;
 
        mutex_lock(&cryptocop_mutex);
-       ret = cryptocop_ioctl_unlocked(inode, filp, cmd, arg);
+       ret = cryptocop_ioctl_unlocked(file_inode(filp), filp, cmd, arg);
        mutex_unlock(&cryptocop_mutex);
 
        return ret;
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index a6a180bc566f..219f704e3221 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -609,7 +609,7 @@ static int sync_serial_release(struct inode *inode, struct file *file)
 
 static unsigned int sync_serial_poll(struct file *file, poll_table *wait)
 {
-        int dev = iminor(file->f_path.dentry->d_inode);
+        int dev = iminor(file_inode(file));
         unsigned int mask = 0;
         sync_port *port;
         DEBUGPOLL( static unsigned int prev_mask = 0; );
@@ -657,7 +657,7 @@ static int sync_serial_ioctl(struct file *file,
 {
         int return_val = 0;
         int dma_w_size = regk_dma_set_w_size1;
-        int dev = iminor(file->f_path.dentry->d_inode);
+        int dev = iminor(file_inode(file));
         sync_port *port;
         reg_sser_rw_tr_cfg tr_cfg;
         reg_sser_rw_rec_cfg rec_cfg;
@@ -979,7 +979,7 @@ static long sync_serial_ioctl(struct file *file,
 static ssize_t sync_serial_write(struct file *file, const char *buf,
                                  size_t count, loff_t *ppos)
 {
-        int dev = iminor(file->f_path.dentry->d_inode);
+        int dev = iminor(file_inode(file));
         DECLARE_WAITQUEUE(wait, current);
         struct sync_port *port;
         int trunc_count;
@@ -1102,7 +1102,7 @@ static ssize_t sync_serial_write(struct file *file, const char *buf,
 static ssize_t sync_serial_read(struct file * file, char * buf,
                                 size_t count, loff_t *ppos)
 {
-        int dev = iminor(file->f_path.dentry->d_inode);
+        int dev = iminor(file_inode(file));
         int avail;
         sync_port *port;
         unsigned char* start;