new helper: file_inode(file)

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

2 files changed, 5 insertions, 5 deletions

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;