diff options
| author | Linus Torvalds | 2016-12-14 17:30:08 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-12-14 17:30:08 +0100 |
| commit | 3e5cecf26842ecfde8ea487c02cb12709cd90ef5 (patch) | |
| tree | cf759a9527c4ed71c4671af0bedf26e5dc3a7f52 /fs/jfs | |
| parent | Revert "nvme: add support for the Write Zeroes command" (diff) | |
| parent | fs: jfs: Replace CURRENT_TIME_SEC by current_time() (diff) | |
| download | kernel-qcow2-linux-3e5cecf26842ecfde8ea487c02cb12709cd90ef5.tar.gz kernel-qcow2-linux-3e5cecf26842ecfde8ea487c02cb12709cd90ef5.tar.xz kernel-qcow2-linux-3e5cecf26842ecfde8ea487c02cb12709cd90ef5.zip | |
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.c | 2 |
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); |