Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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()

Linus Torvalds 9 years ago 3e5cecf2 cdb98c26

+1 -1

1 changed file

expand all

jfs

ioctl.c

+1 -1

fs/jfs/ioctl.c

··· 121 121 122 122 jfs_set_inode_flags(inode); 123 123 inode_unlock(inode); 124 - inode->i_ctime = CURRENT_TIME_SEC; 124 + inode->i_ctime = current_time(inode); 125 125 mark_inode_dirty(inode); 126 126 setflags_out: 127 127 mnt_drop_write_file(filp);