new helper: file_inode(file)

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

79 files changed, 147 insertions, 149 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 9a13e889837e..8f12dc78a848 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -6547,7 +6547,7 @@ static ssize_t dac960_user_command_proc_write(struct file *file,
                                        const char __user *Buffer,
                                        size_t Count, loff_t *pos)
 {
-  DAC960_Controller_T *Controller = (DAC960_Controller_T *) PDE(file->f_path.dentry->d_inode)->data;
+  DAC960_Controller_T *Controller = (DAC960_Controller_T *) PDE(file_inode(file))->data;
   unsigned char CommandBuffer[80];
   int Length;
   if (Count > sizeof(CommandBuffer)-1) return -EINVAL;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 043ddcca4abf..ade146bf65e5 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -625,7 +625,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                         return -EBUSY;
                 file = fget(arg);
                 if (file) {
-                        struct inode *inode = file->f_path.dentry->d_inode;
+                        struct inode *inode = file_inode(file);
                         if (S_ISSOCK(inode->i_mode)) {
                                 nbd->file = file;
                                 nbd->sock = SOCKET_I(inode);
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 052797b32bd3..01a5ca7425d7 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -181,7 +181,7 @@ static int dsp56k_upload(u_char __user *bin, int len)
 static ssize_t dsp56k_read(struct file *file, char __user *buf, size_t count,
                            loff_t *ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int dev = iminor(inode) & 0x0f;
 
         switch(dev)
@@ -244,7 +244,7 @@ static ssize_t dsp56k_read(struct file *file, char __user *buf, size_t count,
 static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t count,
                             loff_t *ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int dev = iminor(inode) & 0x0f;
 
         switch(dev)
@@ -306,7 +306,7 @@ static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t co
 static long dsp56k_ioctl(struct file *file, unsigned int cmd,
                          unsigned long arg)
 {
-        int dev = iminor(file->f_path.dentry->d_inode) & 0x0f;
+        int dev = iminor(file_inode(file)) & 0x0f;
         void __user *argp = (void __user *)arg;
 
         switch(dev)
@@ -408,7 +408,7 @@ static long dsp56k_ioctl(struct file *file, unsigned int cmd,
 #if 0
 static unsigned int dsp56k_poll(struct file *file, poll_table *wait)
 {
-        int dev = iminor(file->f_path.dentry->d_inode) & 0x0f;
+        int dev = iminor(file_inode(file)) & 0x0f;
 
         switch(dev)
         {
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 85156dd0caee..65a8d96c0e93 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -125,7 +125,7 @@ static char dtlk_write_tts(char);
 static ssize_t dtlk_read(struct file *file, char __user *buf,
                          size_t count, loff_t * ppos)
 {
-        unsigned int minor = iminor(file->f_path.dentry->d_inode);
+        unsigned int minor = iminor(file_inode(file));
         char ch;
         int i = 0, retries;
 
@@ -177,7 +177,7 @@ static ssize_t dtlk_write(struct file *file, const char __user *buf,
         }
 #endif
 
-        if (iminor(file->f_path.dentry->d_inode) != DTLK_MINOR)
+        if (iminor(file_inode(file)) != DTLK_MINOR)
                 return -EINVAL;
 
         while (1) {
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index a741e418b456..dafd9ac6428f 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -294,7 +294,7 @@ static int lp_wait_ready(int minor, int nonblock)
 static ssize_t lp_write(struct file * file, const char __user * buf,
                         size_t count, loff_t *ppos)
 {
-        unsigned int minor = iminor(file->f_path.dentry->d_inode);
+        unsigned int minor = iminor(file_inode(file));
         struct parport *port = lp_table[minor].dev->port;
         char *kbuf = lp_table[minor].lp_buffer;
         ssize_t retv = 0;
@@ -413,7 +413,7 @@ static ssize_t lp_read(struct file * file, char __user * buf,
                        size_t count, loff_t *ppos)
 {
         DEFINE_WAIT(wait);
-        unsigned int minor=iminor(file->f_path.dentry->d_inode);
+        unsigned int minor=iminor(file_inode(file));
         struct parport *port = lp_table[minor].dev->port;
         ssize_t retval = 0;
         char *kbuf = lp_table[minor].lp_buffer;
@@ -679,7 +679,7 @@ static long lp_ioctl(struct file *file, unsigned int cmd,
         struct timeval par_timeout;
         int ret;
 
-        minor = iminor(file->f_path.dentry->d_inode);
+        minor = iminor(file_inode(file));
         mutex_lock(&lp_mutex);
         switch (cmd) {
         case LPSETTIMEOUT:
@@ -707,7 +707,7 @@ static long lp_compat_ioctl(struct file *file, unsigned int cmd,
         struct timeval par_timeout;
         int ret;
 
-        minor = iminor(file->f_path.dentry->d_inode);
+        minor = iminor(file_inode(file));
         mutex_lock(&lp_mutex);
         switch (cmd) {
         case LPSETTIMEOUT:
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index c6fa3bc2baa8..e23b4a247b72 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -708,7 +708,7 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
 {
         loff_t ret;
 
-        mutex_lock(&file->f_path.dentry->d_inode->i_mutex);
+        mutex_lock(&file_inode(file)->i_mutex);
         switch (orig) {
         case SEEK_CUR:
                 offset += file->f_pos;
@@ -725,7 +725,7 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
         default:
                 ret = -EINVAL;
         }
-        mutex_unlock(&file->f_path.dentry->d_inode->i_mutex);
+        mutex_unlock(&file_inode(file)->i_mutex);
         return ret;
 }
 
diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c
index 808d44e9a32a..b07b119ae57f 100644
--- a/drivers/char/nsc_gpio.c
+++ b/drivers/char/nsc_gpio.c
@@ -41,7 +41,7 @@ void nsc_gpio_dump(struct nsc_gpio_ops *amp, unsigned index)
 ssize_t nsc_gpio_write(struct file *file, const char __user *data,
                        size_t len, loff_t *ppos)
 {
-        unsigned m = iminor(file->f_path.dentry->d_inode);
+        unsigned m = iminor(file_inode(file));
         struct nsc_gpio_ops *amp = file->private_data;
         struct device *dev = amp->dev;
         size_t i;
@@ -104,7 +104,7 @@ ssize_t nsc_gpio_write(struct file *file, const char __user *data,
 ssize_t nsc_gpio_read(struct file *file, char __user * buf,
                       size_t len, loff_t * ppos)
 {
-        unsigned m = iminor(file->f_path.dentry->d_inode);
+        unsigned m = iminor(file_inode(file));
         int value;
         struct nsc_gpio_ops *amp = file->private_data;
 
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index a7584860e9a7..c115217c79ae 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1400,7 +1400,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
         struct cm4000_dev *dev = filp->private_data;
         unsigned int iobase = dev->p_dev->resource[0]->start;
-        struct inode *inode = filp->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(filp);
         struct pcmcia_device *link;
         int size;
         int rc;
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 1cd49241e60e..ae0b42b66e55 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -107,7 +107,7 @@ static inline void pp_enable_irq (struct pp_struct *pp)
 static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
                         loff_t * ppos)
 {
-        unsigned int minor = iminor(file->f_path.dentry->d_inode);
+        unsigned int minor = iminor(file_inode(file));
         struct pp_struct *pp = file->private_data;
         char * kbuffer;
         ssize_t bytes_read = 0;
@@ -189,7 +189,7 @@ static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
 static ssize_t pp_write (struct file * file, const char __user * buf,
                          size_t count, loff_t * ppos)
 {
-        unsigned int minor = iminor(file->f_path.dentry->d_inode);
+        unsigned int minor = iminor(file_inode(file));
         struct pp_struct *pp = file->private_data;
         char * kbuffer;
         ssize_t bytes_written = 0;
@@ -324,7 +324,7 @@ static enum ieee1284_phase init_phase (int mode)
 
 static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        unsigned int minor = iminor(file->f_path.dentry->d_inode);
+        unsigned int minor = iminor(file_inode(file));
         struct pp_struct *pp = file->private_data;
         struct parport * port;
         void __user *argp = (void __user *)arg;
diff --git a/drivers/char/ps3flash.c b/drivers/char/ps3flash.c
index 588063ac9517..8cafa9ccd43f 100644
--- a/drivers/char/ps3flash.c
+++ b/drivers/char/ps3flash.c
@@ -312,7 +312,7 @@ static int ps3flash_flush(struct file *file, fl_owner_t id)
 
 static int ps3flash_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int err;
         mutex_lock(&inode->i_mutex);
         err = ps3flash_writeback(ps3flash_dev);
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 54a3a6d09819..f3223aac4df1 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -80,7 +80,7 @@ static int raw_open(struct inode *inode, struct file *filp)
         filp->f_flags |= O_DIRECT;
         filp->f_mapping = bdev->bd_inode->i_mapping;
         if (++raw_devices[minor].inuse == 1)
-                filp->f_path.dentry->d_inode->i_mapping =
+                file_inode(filp)->i_mapping =
                         bdev->bd_inode->i_mapping;
         filp->private_data = bdev;
         mutex_unlock(&raw_mutex);
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index d780295a1473..8450e178b819 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -938,7 +938,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
         }
 
         if (ret > 0) {
-                struct inode *inode = file->f_path.dentry->d_inode;
+                struct inode *inode = file_inode(file);
                 inode->i_atime = current_fs_time(inode->i_sb);
         }
 
diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c
index 34c63f85104d..47b9fdfcf083 100644
--- a/drivers/char/tb0219.c
+++ b/drivers/char/tb0219.c
@@ -164,7 +164,7 @@ static ssize_t tanbac_tb0219_read(struct file *file, char __user *buf, size_t le
         unsigned int minor;
         char value;
 
-        minor = iminor(file->f_path.dentry->d_inode);
+        minor = iminor(file_inode(file));
         switch (minor) {
         case 0:
                 value = get_led();
@@ -200,7 +200,7 @@ static ssize_t tanbac_tb0219_write(struct file *file, const char __user *data,
         int retval = 0;
         char c;
 
-        minor = iminor(file->f_path.dentry->d_inode);
+        minor = iminor(file_inode(file));
         switch (minor) {
         case 0:
                 type = TYPE_LED;
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
index 04a371aceb34..054e26e769ec 100644
--- a/drivers/gpu/drm/gma500/gtt.c
+++ b/drivers/gpu/drm/gma500/gtt.c
@@ -202,7 +202,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt)
         WARN_ON(gt->pages);
 
         /* This is the shared memory object that backs the GEM resource */
-        inode = gt->gem.filp->f_path.dentry->d_inode;
+        inode = file_inode(gt->gem.filp);
         mapping = inode->i_mapping;
 
         gt->pages = kmalloc(pages * sizeof(struct page *), GFP_KERNEL);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 8febea6daa08..d7d772b30f1a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1635,7 +1635,7 @@ i915_gem_object_truncate(struct drm_i915_gem_object *obj)
          * To do this we must instruct the shmfs to drop all of its
          * backing pages, *now*.
          */
-        inode = obj->base.filp->f_path.dentry->d_inode;
+        inode = file_inode(obj->base.filp);
         shmem_truncate_range(inode, 0, (loff_t)-1);
 
         obj->madv = __I915_MADV_PURGED;
@@ -1800,7 +1800,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
          *
          * Fail silently without starting the shrinker
          */
-        mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping;
+        mapping = file_inode(obj->base.filp)->i_mapping;
         gfp = mapping_gfp_mask(mapping);
         gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;
         gfp &= ~(__GFP_IO | __GFP_WAIT);
@@ -3724,7 +3724,7 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
                 mask |= __GFP_DMA32;
         }
 
-        mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping;
+        mapping = file_inode(obj->base.filp)->i_mapping;
         mapping_set_gfp_mask(mapping, mask);
 
         i915_gem_object_init(obj, &i915_gem_object_ops);
@@ -4228,7 +4228,7 @@ void i915_gem_free_all_phys_object(struct drm_device *dev)
 void i915_gem_detach_phys_object(struct drm_device *dev,
                                  struct drm_i915_gem_object *obj)
 {
-        struct address_space *mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping;
+        struct address_space *mapping = file_inode(obj->base.filp)->i_mapping;
         char *vaddr;
         int i;
         int page_count;
@@ -4264,7 +4264,7 @@ i915_gem_attach_phys_object(struct drm_device *dev,
                             int id,
                             int align)
 {
-        struct address_space *mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping;
+        struct address_space *mapping = file_inode(obj->base.filp)->i_mapping;
         drm_i915_private_t *dev_priv = dev->dev_private;
         int ret = 0;
         int page_count;
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 7d759a430294..5e93a52d4f2c 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -296,7 +296,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm)
         swap_storage = ttm->swap_storage;
         BUG_ON(swap_storage == NULL);
 
-        swap_space = swap_storage->f_path.dentry->d_inode->i_mapping;
+        swap_space = file_inode(swap_storage)->i_mapping;
 
         for (i = 0; i < ttm->num_pages; ++i) {
                 from_page = shmem_read_mapping_page(swap_space, i);
@@ -345,7 +345,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
         } else
                 swap_storage = persistent_swap_storage;
 
-        swap_space = swap_storage->f_path.dentry->d_inode->i_mapping;
+        swap_space = file_inode(swap_storage)->i_mapping;
 
         for (i = 0; i < ttm->num_pages; ++i) {
                 from_page = ttm->pages[i];
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index afd212c99216..3816270ba49b 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -137,7 +137,7 @@ static int udl_gem_get_pages(struct udl_gem_object *obj, gfp_t gfpmask)
         if (obj->pages == NULL)
                 return -ENOMEM;
 
-        inode = obj->base.filp->f_path.dentry->d_inode;
+        inode = file_inode(obj->base.filp);
         mapping = inode->i_mapping;
         gfpmask |= mapping_gfp_mask(mapping);
 
diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c
index b685b04dbf9d..d7437ef5c695 100644
--- a/drivers/hid/hid-roccat.c
+++ b/drivers/hid/hid-roccat.c
@@ -378,7 +378,7 @@ EXPORT_SYMBOL_GPL(roccat_disconnect);
 
 static long roccat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct roccat_device *device;
         unsigned int minor = iminor(inode);
         long retval = 0;
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 413a73187d33..3ad07a53a229 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -108,7 +108,7 @@ out:
  * This function is to be called with the minors_lock mutex held */
 static ssize_t hidraw_send_report(struct file *file, const char __user *buffer, size_t count, unsigned char report_type)
 {
-        unsigned int minor = iminor(file->f_path.dentry->d_inode);
+        unsigned int minor = iminor(file_inode(file));
         struct hid_device *dev;
         __u8 *buf;
         int ret = 0;
@@ -176,7 +176,7 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t
  *  mutex held. */
 static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t count, unsigned char report_type)
 {
-        unsigned int minor = iminor(file->f_path.dentry->d_inode);
+        unsigned int minor = iminor(file_inode(file));
         struct hid_device *dev;
         __u8 *buf;
         int ret = 0, len;
@@ -340,7 +340,7 @@ unlock:
 static long hidraw_ioctl(struct file *file, unsigned int cmd,
                                                         unsigned long arg)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         unsigned int minor = iminor(inode);
         long ret = 0;
         struct hidraw *dev;
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 5ec2261574ec..c3ccdea3d180 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -148,7 +148,7 @@ static ssize_t i2cdev_read(struct file *file, char __user *buf, size_t count,
                 return -ENOMEM;
 
         pr_debug("i2c-dev: i2c-%d reading %zu bytes.\n",
-                iminor(file->f_path.dentry->d_inode), count);
+                iminor(file_inode(file)), count);
 
         ret = i2c_master_recv(client, tmp, count);
         if (ret >= 0)
@@ -172,7 +172,7 @@ static ssize_t i2cdev_write(struct file *file, const char __user *buf,
                 return PTR_ERR(tmp);
 
         pr_debug("i2c-dev: i2c-%d writing %zu bytes.\n",
-                iminor(file->f_path.dentry->d_inode), count);
+                iminor(file_inode(file)), count);
 
         ret = i2c_master_send(client, tmp, count);
         kfree(tmp);
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index a3133d7b2a0c..2abcc4790f12 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -333,7 +333,7 @@ static int ide_settings_proc_open(struct inode *inode, struct file *file)
 static ssize_t ide_settings_proc_write(struct file *file, const char __user *buffer,
                                        size_t count, loff_t *pos)
 {
-        ide_drive_t     *drive = (ide_drive_t *) PDE(file->f_path.dentry->d_inode)->data;
+        ide_drive_t     *drive = (ide_drive_t *) PDE(file_inode(file))->data;
         char            name[MAX_LEN + 1];
         int             for_real = 0, mul_factor, div_factor;
         unsigned long   n;
@@ -558,7 +558,7 @@ static int ide_replace_subdriver(ide_drive_t *drive, const char *driver)
 static ssize_t ide_driver_proc_write(struct file *file, const char __user *buffer,
                                      size_t count, loff_t *pos)
 {
-        ide_drive_t     *drive = (ide_drive_t *) PDE(file->f_path.dentry->d_inode)->data;
+        ide_drive_t     *drive = (ide_drive_t *) PDE(file_inode(file))->data;
         char name[32];
 
         if (!capable(CAP_SYS_ADMIN))
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 0cb0007724a2..792e7e9b376f 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -730,7 +730,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
                         goto err_tree_mutex_unlock;
                 }
 
-                inode = f.file->f_path.dentry->d_inode;
+                inode = file_inode(f.file);
                 xrcd = find_xrcd(file->device, inode);
                 if (!xrcd && !(cmd.oflags & O_CREAT)) {
                         /* no file descriptor. Need CREATE flag */
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 3eb7e454849b..aed8afee56da 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1864,9 +1864,9 @@ static int ipath_assign_port(struct file *fp,
                 goto done_chk_sdma;
         }
 
-        i_minor = iminor(fp->f_path.dentry->d_inode) - IPATH_USER_MINOR_BASE;
+        i_minor = iminor(file_inode(fp)) - IPATH_USER_MINOR_BASE;
         ipath_cdbg(VERBOSE, "open on dev %lx (minor %d)\n",
-                   (long)fp->f_path.dentry->d_inode->i_rdev, i_minor);
+                   (long)file_inode(fp)->i_rdev, i_minor);
 
         if (i_minor)
                 ret = find_free_port(i_minor - 1, fp, uinfo);
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index a4de9d58e9b4..a479375a8fd8 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -113,7 +113,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
         struct infinipath_counters counters;
         struct ipath_devdata *dd;
 
-        dd = file->f_path.dentry->d_inode->i_private;
+        dd = file_inode(file)->i_private;
         dd->ipath_f_read_counters(dd, &counters);
 
         return simple_read_from_buffer(buf, count, ppos, &counters,
@@ -154,7 +154,7 @@ static ssize_t flash_read(struct file *file, char __user *buf,
                 goto bail;
         }
 
-        dd = file->f_path.dentry->d_inode->i_private;
+        dd = file_inode(file)->i_private;
         if (ipath_eeprom_read(dd, pos, tmp, count)) {
                 ipath_dev_err(dd, "failed to read from flash\n");
                 ret = -ENXIO;
@@ -207,7 +207,7 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
                 goto bail_tmp;
         }
 
-        dd = file->f_path.dentry->d_inode->i_private;
+        dd = file_inode(file)->i_private;
         if (ipath_eeprom_write(dd, pos, tmp, count)) {
                 ret = -ENXIO;
                 ipath_dev_err(dd, "failed to write to flash\n");
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 959a5c4ff812..4f7aa301b3b1 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1524,7 +1524,7 @@ static int qib_assign_ctxt(struct file *fp, const struct qib_user_info *uinfo)
                 }
         }
 
-        i_minor = iminor(fp->f_dentry->d_inode) - QIB_USER_MINOR_BASE;
+        i_minor = iminor(file_inode(fp)) - QIB_USER_MINOR_BASE;
         if (i_minor)
                 ret = find_free_ctxt(i_minor - 1, fp, uinfo);
         else
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index 65a2a23f6f8a..644bd6f6467c 100644
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -45,7 +45,7 @@
 
 static struct super_block *qib_super;
 
-#define private2dd(file) ((file)->f_dentry->d_inode->i_private)
+#define private2dd(file) (file_inode(file)->i_private)
 
 static int qibfs_mknod(struct inode *dir, struct dentry *dentry,
                        umode_t mode, const struct file_operations *fops,
@@ -171,7 +171,7 @@ static const struct file_operations cntr_ops[] = {
 };
 
 /*
- * Could use file->f_dentry->d_inode->i_ino to figure out which file,
+ * Could use file_inode(file)->i_ino to figure out which file,
  * instead of separate routine for each, but for now, this works...
  */
 
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index fc178893789a..7db150ca163e 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -964,7 +964,6 @@ static ssize_t smmu_debugfs_stats_write(struct file *file,
 {
         struct smmu_debugfs_info *info;
         struct smmu_device *smmu;
-        struct dentry *dent;
         int i;
         enum {
                 _OFF = 0,
@@ -992,8 +991,7 @@ static ssize_t smmu_debugfs_stats_write(struct file *file,
         if (i == ARRAY_SIZE(command))
                 return -EINVAL;
 
-        dent = file->f_dentry;
-        info = dent->d_inode->i_private;
+        info = file_inode(file)->i_private;
         smmu = info->smmu;
 
         offs = SMMU_CACHE_CONFIG(info->cache);
diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c
index af4fd3d036c1..3a4165c61196 100644
--- a/drivers/isdn/hardware/eicon/divasproc.c
+++ b/drivers/isdn/hardware/eicon/divasproc.c
@@ -145,7 +145,7 @@ void remove_divas_proc(void)
 static ssize_t grp_opt_proc_write(struct file *file, const char __user *buffer,
                                   size_t count, loff_t *pos)
 {
-        diva_os_xdi_adapter_t *a = PDE(file->f_path.dentry->d_inode)->data;
+        diva_os_xdi_adapter_t *a = PDE(file_inode(file))->data;
         PISDN_ADAPTER IoAdapter = IoAdapters[a->controller - 1];
 
         if ((count == 1) || (count == 2)) {
@@ -172,7 +172,7 @@ static ssize_t grp_opt_proc_write(struct file *file, const char __user *buffer,
 static ssize_t d_l1_down_proc_write(struct file *file, const char __user *buffer,
                                     size_t count, loff_t *pos)
 {
-        diva_os_xdi_adapter_t *a = PDE(file->f_path.dentry->d_inode)->data;
+        diva_os_xdi_adapter_t *a = PDE(file_inode(file))->data;
         PISDN_ADAPTER IoAdapter = IoAdapters[a->controller - 1];
 
         if ((count == 1) || (count == 2)) {
@@ -251,7 +251,7 @@ static const struct file_operations grp_opt_proc_fops = {
 static ssize_t info_proc_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *pos)
 {
-        diva_os_xdi_adapter_t *a = PDE(file->f_path.dentry->d_inode)->data;
+        diva_os_xdi_adapter_t *a = PDE(file_inode(file))->data;
         PISDN_ADAPTER IoAdapter = IoAdapters[a->controller - 1];
         char c[4];
 
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index 88e4f0ee073c..9a3ce93665c5 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -173,7 +173,7 @@ hysdn_log_read(struct file *file, char __user *buf, size_t count, loff_t *off)
 {
         struct log_data *inf;
         int len;
-        struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *pde = PDE(file_inode(file));
         struct procdata *pd = NULL;
         hysdn_card *card;
 
@@ -319,7 +319,7 @@ static unsigned int
 hysdn_log_poll(struct file *file, poll_table *wait)
 {
         unsigned int mask = 0;
-        struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *pde = PDE(file_inode(file));
         hysdn_card *card;
         struct procdata *pd = NULL;
 
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index e2a945ee9f05..32049ed2f24c 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1058,7 +1058,7 @@ isdn_info_update(void)
 static ssize_t
 isdn_read(struct file *file, char __user *buf, size_t count, loff_t *off)
 {
-        uint minor = iminor(file->f_path.dentry->d_inode);
+        uint minor = iminor(file_inode(file));
         int len = 0;
         int drvidx;
         int chidx;
@@ -1165,7 +1165,7 @@ out:
 static ssize_t
 isdn_write(struct file *file, const char __user *buf, size_t count, loff_t *off)
 {
-        uint minor = iminor(file->f_path.dentry->d_inode);
+        uint minor = iminor(file_inode(file));
         int drvidx;
         int chidx;
         int retval;
@@ -1228,7 +1228,7 @@ static unsigned int
 isdn_poll(struct file *file, poll_table *wait)
 {
         unsigned int mask = 0;
-        unsigned int minor = iminor(file->f_path.dentry->d_inode);
+        unsigned int minor = iminor(file_inode(file));
         int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
 
         mutex_lock(&isdn_mutex);
@@ -1269,7 +1269,7 @@ out:
 static int
 isdn_ioctl(struct file *file, uint cmd, ulong arg)
 {
-        uint minor = iminor(file->f_path.dentry->d_inode);
+        uint minor = iminor(file_inode(file));
         isdn_ctrl c;
         int drvidx;
         int ret;
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 61d78fa03b1a..38ceac5053a0 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -668,7 +668,7 @@ isdn_ppp_poll(struct file *file, poll_table *wait)
 
         if (is->debug & 0x2)
                 printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n",
-                       iminor(file->f_path.dentry->d_inode));
+                       iminor(file_inode(file)));
 
         /* just registers wait_queue hook. This doesn't really wait. */
         poll_wait(file, &is->wq, wait);
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 7155945f8eb8..4fd9d6aeff6a 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -337,7 +337,7 @@ static int read_page(struct file *file, unsigned long index,
                      struct page *page)
 {
         int ret = 0;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct buffer_head *bh;
         sector_t block;
 
@@ -755,7 +755,7 @@ static void bitmap_file_unmap(struct bitmap_storage *store)
                 free_buffers(sb_page);
 
         if (file) {
-                struct inode *inode = file->f_path.dentry->d_inode;
+                struct inode *inode = file_inode(file);
                 invalidate_mapping_pages(inode->i_mapping, 0, -1);
                 fput(file);
         }
diff --git a/drivers/media/pci/zoran/zoran_procfs.c b/drivers/media/pci/zoran/zoran_procfs.c
index f1423b777db1..e084b0a21b1b 100644
--- a/drivers/media/pci/zoran/zoran_procfs.c
+++ b/drivers/media/pci/zoran/zoran_procfs.c
@@ -137,7 +137,7 @@ static int zoran_open(struct inode *inode, struct file *file)
 static ssize_t zoran_write(struct file *file, const char __user *buffer,
                         size_t count, loff_t *ppos)
 {
-        struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data;
+        struct zoran *zr = PDE(file_inode(file))->data;
         char *string, *sp;
         char *line, *ldelim, *varname, *svar, *tdelim;
 
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index ca12d3289bfe..35002367485c 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -531,7 +531,7 @@ EXPORT_SYMBOL(lirc_dev_fop_close);
 
 unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
 {
-        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        struct irctl *ir = irctls[iminor(file_inode(file))];
         unsigned int ret;
 
         if (!ir) {
@@ -565,7 +565,7 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         __u32 mode;
         int result = 0;
-        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        struct irctl *ir = irctls[iminor(file_inode(file))];
 
         if (!ir) {
                 printk(KERN_ERR "lirc_dev: %s: no irctl found!\n", __func__);
@@ -650,7 +650,7 @@ ssize_t lirc_dev_fop_read(struct file *file,
                           size_t length,
                           loff_t *ppos)
 {
-        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        struct irctl *ir = irctls[iminor(file_inode(file))];
         unsigned char *buf;
         int ret = 0, written = 0;
         DECLARE_WAITQUEUE(wait, current);
@@ -754,10 +754,10 @@ void *lirc_get_pdata(struct file *file)
 {
         void *data = NULL;
 
-        if (file && file->f_dentry && file->f_dentry->d_inode &&
-            file->f_dentry->d_inode->i_rdev) {
+        if (file && file->f_dentry && file_inode(file) &&
+            file_inode(file)->i_rdev) {
                 struct irctl *ir;
-                ir = irctls[iminor(file->f_dentry->d_inode)];
+                ir = irctls[iminor(file_inode(file))];
                 data = ir->d.data;
         }
 
@@ -769,7 +769,7 @@ EXPORT_SYMBOL(lirc_get_pdata);
 ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
                            size_t length, loff_t *ppos)
 {
-        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        struct irctl *ir = irctls[iminor(file_inode(file))];
 
         if (!ir) {
                 printk(KERN_ERR "%s: called with invalid irctl\n", __func__);
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 98dcad9c8a3b..870de1d5667a 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -222,7 +222,7 @@ static struct class video_class = {
 
 struct video_device *video_devdata(struct file *file)
 {
-        return video_device[iminor(file->f_path.dentry->d_inode)];
+        return video_device[iminor(file_inode(file))];
 }
 EXPORT_SYMBOL(video_devdata);
 
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index dfcc65b33e99..4f02848bb2bc 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -194,7 +194,7 @@ static int vol_cdev_fsync(struct file *file, loff_t start, loff_t end,
 {
         struct ubi_volume_desc *desc = file->private_data;
         struct ubi_device *ubi = desc->vol->ubi;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int err;
         mutex_lock(&inode->i_mutex);
         err = ubi_sync(ubi->ubi_num);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index f0718e1a8369..8fb1ccfe74dc 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2336,7 +2336,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 6aed238e573e..1505509728aa 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -939,14 +939,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 598ca1cafb95..5311ba1dcd2c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2769,7 +2769,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;
 }
 
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index f2f501e5b6a0..d4d800c54d86 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -179,7 +179,7 @@ static int led_proc_open(struct inode *inode, struct file *file)
 static ssize_t led_proc_write(struct file *file, const char *buf,
         size_t count, loff_t *pos)
 {
-        void *data = PDE(file->f_path.dentry->d_inode)->data;
+        void *data = PDE(file_inode(file))->data;
         char *cur, lbuf[32];
         int d;
 
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 9b8505ccc56d..0b009470e6db 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -21,7 +21,7 @@ static loff_t
 proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
 {
         loff_t new = -1;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
 
         mutex_lock(&inode->i_mutex);
         switch (whence) {
@@ -46,7 +46,7 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
 static ssize_t
 proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
-        const struct inode *ino = file->f_path.dentry->d_inode;
+        const struct inode *ino = file_inode(file);
         const struct proc_dir_entry *dp = PDE(ino);
         struct pci_dev *dev = dp->data;
         unsigned int pos = *ppos;
@@ -132,7 +132,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
 static ssize_t
 proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, loff_t *ppos)
 {
-        struct inode *ino = file->f_path.dentry->d_inode;
+        struct inode *ino = file_inode(file);
         const struct proc_dir_entry *dp = PDE(ino);
         struct pci_dev *dev = dp->data;
         int pos = *ppos;
@@ -212,7 +212,7 @@ struct pci_filp_private {
 static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
                                unsigned long arg)
 {
-        const struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
+        const struct proc_dir_entry *dp = PDE(file_inode(file));
         struct pci_dev *dev = dp->data;
 #ifdef HAVE_PCI_MMAP
         struct pci_filp_private *fpriv = file->private_data;
@@ -253,7 +253,7 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
 #ifdef HAVE_PCI_MMAP
 static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         const struct proc_dir_entry *dp = PDE(inode);
         struct pci_dev *dev = dp->data;
         struct pci_filp_private *fpriv = file->private_data;
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index b8ad71f7863f..8853d013a716 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -3566,7 +3566,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
         }
 
         if (ret > 0) {
-                struct inode *inode = file->f_path.dentry->d_inode;
+                struct inode *inode = file_inode(file);
                 inode->i_atime = current_fs_time(inode->i_sb);
         }
 
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index f946ca7cb762..05dfd569d912 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -852,7 +852,7 @@ static ssize_t dispatch_proc_write(struct file *file,
                         const char __user *userbuf,
                         size_t count, loff_t *pos)
 {
-        struct ibm_struct *ibm = PDE(file->f_path.dentry->d_inode)->data;
+        struct ibm_struct *ibm = PDE(file_inode(file))->data;
         char *kernbuf;
         int ret;
 
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index c2727895794c..6fba80ad3bca 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -583,7 +583,7 @@ static int set_lcd_status(struct backlight_device *bd)
 static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
                               size_t count, loff_t *pos)
 {
-        struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
+        struct toshiba_acpi_dev *dev = PDE(file_inode(file))->data;
         char cmd[42];
         size_t len;
         int value;
@@ -650,7 +650,7 @@ static int video_proc_open(struct inode *inode, struct file *file)
 static ssize_t video_proc_write(struct file *file, const char __user *buf,
                                 size_t count, loff_t *pos)
 {
-        struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
+        struct toshiba_acpi_dev *dev = PDE(file_inode(file))->data;
         char *cmd, *buffer;
         int ret;
         int value;
@@ -750,7 +750,7 @@ static int fan_proc_open(struct inode *inode, struct file *file)
 static ssize_t fan_proc_write(struct file *file, const char __user *buf,
                               size_t count, loff_t *pos)
 {
-        struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
+        struct toshiba_acpi_dev *dev = PDE(file_inode(file))->data;
         char cmd[42];
         size_t len;
         int value;
@@ -822,7 +822,7 @@ static int keys_proc_open(struct inode *inode, struct file *file)
 static ssize_t keys_proc_write(struct file *file, const char __user *buf,
                                size_t count, loff_t *pos)
 {
-        struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
+        struct toshiba_acpi_dev *dev = PDE(file_inode(file))->data;
         char cmd[42];
         size_t len;
         int value;
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 315b3112aca8..65f735ac6b3b 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -30,7 +30,7 @@ static struct proc_dir_entry *isapnp_proc_bus_dir = NULL;
 static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence)
 {
         loff_t new = -1;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
 
         mutex_lock(&inode->i_mutex);
         switch (whence) {
@@ -55,7 +55,7 @@ static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence)
 static ssize_t isapnp_proc_bus_read(struct file *file, char __user * buf,
                                     size_t nbytes, loff_t * ppos)
 {
-        struct inode *ino = file->f_path.dentry->d_inode;
+        struct inode *ino = file_inode(file);
         struct proc_dir_entry *dp = PDE(ino);
         struct pnp_dev *dev = dp->data;
         int pos = *ppos;
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index bc89f392a629..63ddb0173456 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -244,7 +244,7 @@ static int pnpbios_proc_open(struct inode *inode, struct file *file)
 static ssize_t pnpbios_proc_write(struct file *file, const char __user *buf,
                                   size_t count, loff_t *pos)
 {
-        void *data = PDE(file->f_path.dentry->d_inode)->data;
+        void *data = PDE(file_inode(file))->data;
         struct pnp_bios_node *node;
         int boot = (long)data >> 8;
         u8 nodenum = (long)data;
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 = {
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index e85c803b30cd..fc1339cf91ac 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -107,7 +107,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         int error = 0;
         u8 ireg = 0;
 
-        if (D7S_MINOR != iminor(file->f_path.dentry->d_inode))
+        if (D7S_MINOR != iminor(file_inode(file)))
                 return -ENODEV;
 
         mutex_lock(&d7s_mutex);
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index d1f0120cdb98..5e1e12c0cf42 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -640,7 +640,7 @@ out:
 /* This function handles ioctl for the character device */
 static long twa_chrdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         long timeout;
         unsigned long *cpu_addr, data_buffer_length_adjusted = 0, flags = 0;
         dma_addr_t dma_handle;
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index 52a2f0580d97..c845bdbeb6c0 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -757,7 +757,7 @@ static long twl_chrdev_ioctl(struct file *file, unsigned int cmd, unsigned long
         dma_addr_t dma_handle;
         int request_id = 0;
         TW_Ioctl_Driver_Command driver_command;
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file_inode(file);
         TW_Ioctl_Buf_Apache *tw_ioctl;
         TW_Command_Full *full_command_packet;
         TW_Device_Extension *tw_dev = twl_device_extension_list[iminor(inode)];
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 62071d2fc1ce..56662ae03dea 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -889,7 +889,7 @@ static long tw_chrdev_ioctl(struct file *file, unsigned int cmd, unsigned long a
         unsigned long flags;
         unsigned int data_buffer_length = 0;
         unsigned long data_buffer_length_adjusted = 0;
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file_inode(file);
         unsigned long *cpu_addr;
         long timeout;
         TW_New_Ioctl *tw_ioctl;
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index b42cbbd3d92d..c323b2030afa 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -71,7 +71,7 @@ static ssize_t
 csio_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 csio_hw *hw = file->private_data - mem;
 
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index b4f6c9a84e71..b6e2700ec1c6 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -2161,7 +2161,7 @@ static long adpt_unlocked_ioctl(struct file *file, uint cmd, ulong arg)
         struct inode *inode;
         long ret;
  
-        inode = file->f_dentry->d_inode;
+        inode = file_inode(file);
  
         mutex_lock(&adpt_mutex);
         ret = adpt_ioctl(inode, file, cmd, arg);
@@ -2177,7 +2177,7 @@ static long compat_adpt_ioctl(struct file *file,
         struct inode *inode;
         long ret;
  
-        inode = file->f_dentry->d_inode;
+        inode = file_inode(file);
  
         mutex_lock(&adpt_mutex);
  
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 98156a97c472..3e2b3717cb5c 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -977,7 +977,7 @@ static int check_tape(struct scsi_tape *STp, struct file *filp)
         struct st_modedef *STm;
         struct st_partstat *STps;
         char *name = tape_name(STp);
-        struct inode *inode = filp->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(filp);
         int mode = TAPE_MODE(inode);
 
         STp->ready = ST_READY;
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index c92078e7fe86..5d5d95de081e 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -185,7 +185,7 @@ static int BcmFileDownload(struct bcm_mini_adapter *Adapter, const char *path, u
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Unable to Open %s\n", path);
                 return -ENOENT;
         }
-        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Opened file is = %s and length =0x%lx to be downloaded at =0x%x", path, (unsigned long)flp->f_dentry->d_inode->i_size, loc);
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Opened file is = %s and length =0x%lx to be downloaded at =0x%x", path, (unsigned long)file_inode(flp)->i_size, loc);
         do_gettimeofday(&tv);
 
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "download start %lx", ((tv.tv_sec * 1000) + (tv.tv_usec / 1000)));
diff --git a/drivers/staging/ccg/f_mass_storage.c b/drivers/staging/ccg/f_mass_storage.c
index 4f1142efa6d1..20bc2b454ac2 100644
--- a/drivers/staging/ccg/f_mass_storage.c
+++ b/drivers/staging/ccg/f_mass_storage.c
@@ -998,7 +998,7 @@ static int do_synchronize_cache(struct fsg_common *common)
 static void invalidate_sub(struct fsg_lun *curlun)
 {
         struct file     *filp = curlun->filp;
-        struct inode    *inode = filp->f_path.dentry->d_inode;
+        struct inode    *inode = file_inode(filp);
         unsigned long   rc;
 
         rc = invalidate_mapping_pages(inode->i_mapping, 0, -1);
diff --git a/drivers/staging/ccg/rndis.c b/drivers/staging/ccg/rndis.c
index e4192b887de9..d9297eebbf73 100644
--- a/drivers/staging/ccg/rndis.c
+++ b/drivers/staging/ccg/rndis.c
@@ -1065,7 +1065,7 @@ static int rndis_proc_show(struct seq_file *m, void *v)
 static ssize_t rndis_proc_write(struct file *file, const char __user *buffer,
                                 size_t count, loff_t *ppos)
 {
-        rndis_params *p = PDE(file->f_path.dentry->d_inode)->data;
+        rndis_params *p = PDE(file_inode(file))->data;
         u32 speed = 0;
         int i, fl_speed = 0;
 
diff --git a/drivers/staging/ccg/storage_common.c b/drivers/staging/ccg/storage_common.c
index 8d9bcd8207c8..abb01ac74cec 100644
--- a/drivers/staging/ccg/storage_common.c
+++ b/drivers/staging/ccg/storage_common.c
@@ -656,7 +656,7 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         if (!(filp->f_mode & FMODE_WRITE))
                 ro = 1;
 
-        inode = filp->f_path.dentry->d_inode;
+        inode = file_inode(filp);
         if ((!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))) {
                 LINFO(curlun, "invalid file type: %s\n", filename);
                 goto out;
diff --git a/drivers/staging/dgrp/dgrp_specproc.c b/drivers/staging/dgrp/dgrp_specproc.c
index c214078a89e9..b2bda32254ac 100644
--- a/drivers/staging/dgrp/dgrp_specproc.c
+++ b/drivers/staging/dgrp/dgrp_specproc.c
@@ -354,7 +354,7 @@ static int dgrp_gen_proc_open(struct inode *inode, struct file *file)
         struct dgrp_proc_entry *entry;
         int ret = 0;
 
-        de = (struct proc_dir_entry *) PDE(file->f_dentry->d_inode);
+        de = (struct proc_dir_entry *) PDE(file_inode(file));
         if (!de || !de->data) {
                 ret = -ENXIO;
                 goto done;
@@ -384,7 +384,7 @@ static int dgrp_gen_proc_close(struct inode *inode, struct file *file)
         struct proc_dir_entry *de;
         struct dgrp_proc_entry *entry;
 
-        de = (struct proc_dir_entry *) PDE(file->f_dentry->d_inode);
+        de = (struct proc_dir_entry *) PDE(file_inode(file));
         if (!de || !de->data)
                 goto done;
 
diff --git a/drivers/staging/omapdrm/omap_gem_helpers.c b/drivers/staging/omapdrm/omap_gem_helpers.c
index ffb8cceaeb46..7d1b64a7404b 100644
--- a/drivers/staging/omapdrm/omap_gem_helpers.c
+++ b/drivers/staging/omapdrm/omap_gem_helpers.c
@@ -40,7 +40,7 @@ struct page **_drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
         int i, npages;
 
         /* This is the shared memory object that backs the GEM resource */
-        inode = obj->filp->f_path.dentry->d_inode;
+        inode = file_inode(obj->filp);
         mapping = inode->i_mapping;
 
         npages = obj->size >> PAGE_SHIFT;
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index 75189feac380..773014c7c752 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -411,7 +411,7 @@ struct socket *sockfd_to_socket(unsigned int sockfd)
                 return NULL;
         }
 
-        inode = file->f_dentry->d_inode;
+        inode = file_inode(file);
 
         if (!inode || !S_ISSOCK(inode->i_mode)) {
                 fput(file);
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index 4ef852c4c4e1..869ce93ee204 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -318,7 +318,7 @@ static ssize_t buffer_from_user(unsigned int minor, const char __user *buf,
 static ssize_t vme_user_read(struct file *file, char __user *buf, size_t count,
                         loff_t *ppos)
 {
-        unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+        unsigned int minor = MINOR(file_inode(file)->i_rdev);
         ssize_t retval;
         size_t image_size;
         size_t okcount;
@@ -364,7 +364,7 @@ static ssize_t vme_user_read(struct file *file, char __user *buf, size_t count,
 static ssize_t vme_user_write(struct file *file, const char __user *buf,
                         size_t count, loff_t *ppos)
 {
-        unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+        unsigned int minor = MINOR(file_inode(file)->i_rdev);
         ssize_t retval;
         size_t image_size;
         size_t okcount;
@@ -410,7 +410,7 @@ static ssize_t vme_user_write(struct file *file, const char __user *buf,
 static loff_t vme_user_llseek(struct file *file, loff_t off, int whence)
 {
         loff_t absolute = -1;
-        unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+        unsigned int minor = MINOR(file_inode(file)->i_rdev);
         size_t image_size;
 
         if (minor == CONTROL_MINOR)
@@ -583,7 +583,7 @@ vme_user_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         int ret;
 
         mutex_lock(&vme_user_mutex);
-        ret = vme_user_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
+        ret = vme_user_ioctl(file_inode(file), file, cmd, arg);
         mutex_unlock(&vme_user_mutex);
 
         return ret;
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index b9c88497e8f0..a65d507b0b0c 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -265,7 +265,7 @@ static int fd_do_rw(struct se_cmd *cmd, struct scatterlist *sgl,
                  * the expected virt_size for struct file w/o a backing struct
                  * block_device.
                  */
-                if (S_ISBLK(fd->f_dentry->d_inode->i_mode)) {
+                if (S_ISBLK(file_inode(fd)->i_mode)) {
                         if (ret < 0 || ret != cmd->data_length) {
                                 pr_err("%s() returned %d, expecting %u for "
                                                 "S_ISBLK\n", __func__, ret,
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index fa7268a93c06..e4ca345873c3 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -101,7 +101,7 @@ vcs_poll_data_get(struct file *file)
         poll = kzalloc(sizeof(*poll), GFP_KERNEL);
         if (!poll)
                 return NULL;
-        poll->cons_num = iminor(file->f_path.dentry->d_inode) & 127;
+        poll->cons_num = iminor(file_inode(file)) & 127;
         init_waitqueue_head(&poll->waitq);
         poll->notifier.notifier_call = vcs_notifier;
         if (register_vt_notifier(&poll->notifier) != 0) {
@@ -182,7 +182,7 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
         int size;
 
         console_lock();
-        size = vcs_size(file->f_path.dentry->d_inode);
+        size = vcs_size(file_inode(file));
         console_unlock();
         if (size < 0)
                 return size;
@@ -208,7 +208,7 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
 static ssize_t
 vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         unsigned int currcons = iminor(inode);
         struct vc_data *vc;
         struct vcs_poll_data *poll;
@@ -386,7 +386,7 @@ unlock_out:
 static ssize_t
 vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         unsigned int currcons = iminor(inode);
         struct vc_data *vc;
         long pos;
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index cbacea933b18..2c42e06f9717 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -658,7 +658,7 @@ static loff_t usb_device_lseek(struct file *file, loff_t offset, int orig)
 {
         loff_t ret;
 
-        mutex_lock(&file->f_dentry->d_inode->i_mutex);
+        mutex_lock(&file_inode(file)->i_mutex);
 
         switch (orig) {
         case 0:
@@ -674,7 +674,7 @@ static loff_t usb_device_lseek(struct file *file, loff_t offset, int orig)
                 ret = -EINVAL;
         }
 
-        mutex_unlock(&file->f_dentry->d_inode->i_mutex);
+        mutex_unlock(&file_inode(file)->i_mutex);
         return ret;
 }
 
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index b78fbe222b72..6e8af6ddb5f7 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -160,7 +160,7 @@ static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig)
 {
         loff_t ret;
 
-        mutex_lock(&file->f_dentry->d_inode->i_mutex);
+        mutex_lock(&file_inode(file)->i_mutex);
 
         switch (orig) {
         case 0:
@@ -176,7 +176,7 @@ static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig)
                 ret = -EINVAL;
         }
 
-        mutex_unlock(&file->f_dentry->d_inode->i_mutex);
+        mutex_unlock(&file_inode(file)->i_mutex);
         return ret;
 }
 
@@ -1970,7 +1970,7 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
                                 void __user *p)
 {
         struct dev_state *ps = file->private_data;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct usb_device *dev = ps->dev;
         int ret = -ENOTTY;
 
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index a7aed84d98c9..fd49dba53613 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -93,7 +93,7 @@ static ssize_t queue_dbg_read(struct file *file, char __user *buf,
         if (!access_ok(VERIFY_WRITE, buf, nbytes))
                 return -EFAULT;
 
-        mutex_lock(&file->f_dentry->d_inode->i_mutex);
+        mutex_lock(&file_inode(file)->i_mutex);
         list_for_each_entry_safe(req, tmp_req, queue, queue) {
                 len = snprintf(tmpbuf, sizeof(tmpbuf),
                                 "%8p %08x %c%c%c %5d %c%c%c\n",
@@ -120,7 +120,7 @@ static ssize_t queue_dbg_read(struct file *file, char __user *buf,
                 nbytes -= len;
                 buf += len;
         }
-        mutex_unlock(&file->f_dentry->d_inode->i_mutex);
+        mutex_unlock(&file_inode(file)->i_mutex);
 
         return actual;
 }
@@ -168,13 +168,13 @@ out:
 static ssize_t regs_dbg_read(struct file *file, char __user *buf,
                 size_t nbytes, loff_t *ppos)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int ret;
 
         mutex_lock(&inode->i_mutex);
         ret = simple_read_from_buffer(buf, nbytes, ppos,
                         file->private_data,
-                        file->f_dentry->d_inode->i_size);
+                        file_inode(file)->i_size);
         mutex_unlock(&inode->i_mutex);
 
         return ret;
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 5d027b3e1ef0..50a46a429efb 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -992,7 +992,7 @@ static int do_synchronize_cache(struct fsg_common *common)
 static void invalidate_sub(struct fsg_lun *curlun)
 {
         struct file     *filp = curlun->filp;
-        struct inode    *inode = filp->f_path.dentry->d_inode;
+        struct inode    *inode = file_inode(filp);
         unsigned long   rc;
 
         rc = invalidate_mapping_pages(inode->i_mapping, 0, -1);
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 35bcc83d1e04..bf7a56b6d48a 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -688,7 +688,7 @@ static int
 printer_fsync(struct file *fd, loff_t start, loff_t end, int datasync)
 {
         struct printer_dev      *dev = fd->private_data;
-        struct inode *inode = fd->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(fd);
         unsigned long           flags;
         int                     tx_list_empty;
 
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index e4192b887de9..d9297eebbf73 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -1065,7 +1065,7 @@ static int rndis_proc_show(struct seq_file *m, void *v)
 static ssize_t rndis_proc_write(struct file *file, const char __user *buffer,
                                 size_t count, loff_t *ppos)
 {
-        rndis_params *p = PDE(file->f_path.dentry->d_inode)->data;
+        rndis_params *p = PDE(file_inode(file))->data;
         u32 speed = 0;
         int i, fl_speed = 0;
 
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 0e3ae43454a2..b5d3f0eeeb7d 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -501,7 +501,7 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         if (!(filp->f_mode & FMODE_WRITE))
                 ro = 1;
 
-        inode = filp->f_path.dentry->d_inode;
+        inode = file_inode(filp);
         if ((!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))) {
                 LINFO(curlun, "invalid file type: %s\n", filename);
                 goto out;
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 88cad6b8b479..900aa4ecd617 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -69,7 +69,7 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma,
 int fb_deferred_io_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
         struct fb_info *info = file->private_data;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int err = filemap_write_and_wait_range(inode->i_mapping, start, end);
         if (err)
                 return err;
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 3ff0105a496a..bf01980c9554 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -727,7 +727,7 @@ static const struct file_operations fb_proc_fops = {
  */
 static struct fb_info *file_fb_info(struct file *file)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int fbidx = iminor(inode);
         struct fb_info *info = registered_fb[fbidx];
 
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index f2566c19e71c..113c7876c855 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -261,7 +261,7 @@ int get_img(struct mdp_img *img, struct fb_info *info,
         if (f.file == NULL)
                 return -1;
 
-        if (MAJOR(f.file->f_dentry->d_inode->i_rdev) == FB_MAJOR) {
+        if (MAJOR(file_inode(f.file)->i_rdev) == FB_MAJOR) {
                 *start = info->fix.smem_start;
                 *len = info->fix.smem_len;
         } else
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 11d55ce5ca81..70387582843f 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -411,7 +411,7 @@ static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 .identity               = DRIVER_NAME,
         };
         void __user *argp = (void __user *)arg;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int index = iminor(inode) - WD0_MINOR;
         struct cpwd *p = cpwd_device;
         int setopt = 0;
@@ -499,7 +499,7 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd,
 static ssize_t cpwd_write(struct file *file, const char __user *buf,
                           size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct cpwd *p = cpwd_device;
         int index = iminor(inode);
 
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 988880dcee75..73b33837e12c 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -22,7 +22,7 @@ static loff_t
 proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
 {
         loff_t new = -1;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
 
         mutex_lock(&inode->i_mutex);
         switch (whence) {
@@ -47,7 +47,7 @@ proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
 static ssize_t
 proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
-        struct inode *ino = file->f_path.dentry->d_inode;
+        struct inode *ino = file_inode(file);
         struct proc_dir_entry *dp = PDE(ino);
         struct zorro_dev *z = dp->data;
         struct ConfigDev cd;