Commit 3e5cecf2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents cdb98c26 362ad5d5

fs/jfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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);