diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-11 05:16:43 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-11 05:16:43 +0200 |
commit | 101105b1717f536ca741f940033996302d4ef191 (patch) | |
tree | 12ab41ae1b1b66105e9fa2ea763356d2be7e8b34 /fs/attr.c | |
parent | Merge tag 'for-linus-20161008' of git://git.infradead.org/linux-mtd (diff) | |
parent | Merge remote-tracking branch 'ovl/rename2' into for-linus (diff) | |
download | linux-101105b1717f536ca741f940033996302d4ef191.tar.xz linux-101105b1717f536ca741f940033996302d4ef191.zip |
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
Diffstat (limited to 'fs/attr.c')
-rw-r--r-- | fs/attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/attr.c b/fs/attr.c index a19a64d41e7e..c902b3d53508 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -237,7 +237,7 @@ int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **de inode->i_flags &= ~S_NOSEC; } - now = current_fs_time(inode->i_sb); + now = current_time(inode); attr->ia_ctime = now; if (!(ia_valid & ATTR_ATIME_SET)) |