aboutsummaryrefslogtreecommitdiff
path: root/fs/jfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-14 08:30:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-14 08:30:08 -0800
commit3e5cecf26842ecfde8ea487c02cb12709cd90ef5 (patch)
treecf759a9527c4ed71c4671af0bedf26e5dc3a7f52 /fs/jfs
parentcdb98c2698b4af287925abcba4d77d92af82a0c3 (diff)
parent362ad5d58e9ae54d15abbe4822e626be907308fe (diff)
download96b-common-3e5cecf26842ecfde8ea487c02cb12709cd90ef5.tar.gz
Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy
Pull jfs update from David Kleikamp: "The jfs piece of the current_time() series" * tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy: fs: jfs: Replace CURRENT_TIME_SEC by current_time()
Diffstat (limited to 'fs/jfs')
-rw-r--r--fs/jfs/ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c
index 8653cac7e12e..b6fd1ff29ddf 100644
--- a/fs/jfs/ioctl.c
+++ b/fs/jfs/ioctl.c
@@ -121,7 +121,7 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
jfs_set_inode_flags(inode);
inode_unlock(inode);
- inode->i_ctime = CURRENT_TIME_SEC;
+ inode->i_ctime = current_time(inode);
mark_inode_dirty(inode);
setflags_out:
mnt_drop_write_file(filp);