Skip to content

Commit

Permalink
Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy
Browse files Browse the repository at this point in the history
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()
  • Loading branch information
torvalds committed Dec 14, 2016
2 parents cdb98c2 + 362ad5d commit 3e5cecf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/jfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 3e5cecf

Please sign in to comment.