Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull more vfs updates from Al Viro:
 ">rename2() work from Miklos + current_time() from Deepa"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: Replace current_fs_time() with current_time()
  fs: Replace CURRENT_TIME_SEC with current_time() for inode timestamps
  fs: Replace CURRENT_TIME with current_time() for inode timestamps
  fs: proc: Delete inode time initializations in proc_alloc_inode()
  vfs: Add current_time() api
  vfs: add note about i_op->rename changes to porting
  fs: rename "rename2" i_op to "rename"
  vfs: remove unused i_op->rename
  fs: make remaining filesystems use .rename2
  libfs: support RENAME_NOREPLACE in simple_rename()
  fs: support RENAME_NOREPLACE for local filesystems
  ncpfs: fix unused variable warning

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 09c8d9ca61ae..4016dae7433b 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -2409,21 +2409,21 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
                 snoop(&dev->dev, "%s: CONTROL\n", __func__);
                 ret = proc_control(ps, p);
                 if (ret >= 0)
-                        inode->i_mtime = CURRENT_TIME;
+                        inode->i_mtime = current_time(inode);
                 break;
 
         case USBDEVFS_BULK:
                 snoop(&dev->dev, "%s: BULK\n", __func__);
                 ret = proc_bulk(ps, p);
                 if (ret >= 0)
-                        inode->i_mtime = CURRENT_TIME;
+                        inode->i_mtime = current_time(inode);
                 break;
 
         case USBDEVFS_RESETEP:
                 snoop(&dev->dev, "%s: RESETEP\n", __func__);
                 ret = proc_resetep(ps, p);
                 if (ret >= 0)
-                        inode->i_mtime = CURRENT_TIME;
+                        inode->i_mtime = current_time(inode);
                 break;
 
         case USBDEVFS_RESET:
@@ -2435,7 +2435,7 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
                 snoop(&dev->dev, "%s: CLEAR_HALT\n", __func__);
                 ret = proc_clearhalt(ps, p);
                 if (ret >= 0)
-                        inode->i_mtime = CURRENT_TIME;
+                        inode->i_mtime = current_time(inode);
                 break;
 
         case USBDEVFS_GETDRIVER:
@@ -2462,7 +2462,7 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
                 snoop(&dev->dev, "%s: SUBMITURB\n", __func__);
                 ret = proc_submiturb(ps, p);
                 if (ret >= 0)
-                        inode->i_mtime = CURRENT_TIME;
+                        inode->i_mtime = current_time(inode);
                 break;
 
 #ifdef CONFIG_COMPAT
@@ -2470,14 +2470,14 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
                 snoop(&dev->dev, "%s: CONTROL32\n", __func__);
                 ret = proc_control_compat(ps, p);
                 if (ret >= 0)
-                        inode->i_mtime = CURRENT_TIME;
+                        inode->i_mtime = current_time(inode);
                 break;
 
         case USBDEVFS_BULK32:
                 snoop(&dev->dev, "%s: BULK32\n", __func__);
                 ret = proc_bulk_compat(ps, p);
                 if (ret >= 0)
-                        inode->i_mtime = CURRENT_TIME;
+                        inode->i_mtime = current_time(inode);
                 break;
 
         case USBDEVFS_DISCSIGNAL32:
@@ -2489,7 +2489,7 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
                 snoop(&dev->dev, "%s: SUBMITURB32\n", __func__);
                 ret = proc_submiturb_compat(ps, p);
                 if (ret >= 0)
-                        inode->i_mtime = CURRENT_TIME;
+                        inode->i_mtime = current_time(inode);
                 break;
 
         case USBDEVFS_IOCTL32:
@@ -2552,7 +2552,7 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
  done:
         usb_unlock_device(dev);
         if (ret >= 0)
-                inode->i_atime = CURRENT_TIME;
+                inode->i_atime = current_time(inode);
         return ret;
 }