3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index c6c05bfef0e0..e707e31abd81 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2347,7 +2347,7 @@ static ssize_t mem_read(struct file *file, char __user *buf, size_t count,
                         loff_t *ppos)
 {
         loff_t pos = *ppos;
-        loff_t avail = file->f_path.dentry->d_inode->i_size;
+        loff_t avail = file_inode(file)->i_size;
         unsigned int mem = (uintptr_t)file->private_data & 3;
         struct adapter *adap = file->private_data - mem;
 
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 0179cefae438..84734a805092 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -938,14 +938,14 @@ static int cosa_open(struct inode *inode, struct file *file)
         int ret = 0;
 
         mutex_lock(&cosa_chardev_mutex);
-        if ((n=iminor(file->f_path.dentry->d_inode)>>CARD_MINOR_BITS)
+        if ((n=iminor(file_inode(file))>>CARD_MINOR_BITS)
                 >= nr_cards) {
                 ret = -ENODEV;
                 goto out;
         }
         cosa = cosa_cards+n;
 
-        if ((n=iminor(file->f_path.dentry->d_inode)
+        if ((n=iminor(file_inode(file))
                 & ((1<<CARD_MINOR_BITS)-1)) >= cosa->nchannels) {
                 ret = -ENODEV;
                 goto out;
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index e7cf37f550d1..3109c0db66e1 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2778,7 +2778,7 @@ static ssize_t int_proc_write(struct file *file, const char __user *buffer,
                 nr = nr * 10 + c;
                 p++;
         } while (--len);
-        *(int *)PDE(file->f_path.dentry->d_inode)->data = nr;
+        *(int *)PDE(file_inode(file))->data = nr;
         return count;
 }