diff options
author | Deepa Dinamani <deepa.kernel@gmail.com> | 2016-09-14 10:48:06 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-27 21:06:22 -0400 |
commit | c2050a454c7f123d7a57fa1d76ff61bd43643abb (patch) | |
tree | 6f45ffffaf10f2534a38bfa28efb70ec24026a8d /fs/ntfs | |
parent | 02027d42c3f747945f19111d3da2092ed2148ac8 (diff) |
fs: Replace current_fs_time() with current_time()
current_fs_time() uses struct super_block* as an argument.
As per Linus's suggestion, this is changed to take struct
inode* as a parameter instead. This is because the function
is primarily meant for vfs inode timestamps.
Also the function was renamed as per Arnd's suggestion.
Change all calls to current_fs_time() to use the new
current_time() function instead. current_fs_time() will be
deleted.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ntfs')
-rw-r--r-- | fs/ntfs/inode.c | 2 | ||||
-rw-r--r-- | fs/ntfs/mft.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index e01287c964a8..6b7588a6f98c 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c | |||
@@ -2813,7 +2813,7 @@ done: | |||
2813 | * for real. | 2813 | * for real. |
2814 | */ | 2814 | */ |
2815 | if (!IS_NOCMTIME(VFS_I(base_ni)) && !IS_RDONLY(VFS_I(base_ni))) { | 2815 | if (!IS_NOCMTIME(VFS_I(base_ni)) && !IS_RDONLY(VFS_I(base_ni))) { |
2816 | struct timespec now = current_fs_time(VFS_I(base_ni)->i_sb); | 2816 | struct timespec now = current_time(VFS_I(base_ni)); |
2817 | int sync_it = 0; | 2817 | int sync_it = 0; |
2818 | 2818 | ||
2819 | if (!timespec_equal(&VFS_I(base_ni)->i_mtime, &now) || | 2819 | if (!timespec_equal(&VFS_I(base_ni)->i_mtime, &now) || |
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c index d15d492ce47b..d3c009626032 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c | |||
@@ -2692,7 +2692,7 @@ mft_rec_already_initialized: | |||
2692 | 2692 | ||
2693 | /* Set the inode times to the current time. */ | 2693 | /* Set the inode times to the current time. */ |
2694 | vi->i_atime = vi->i_mtime = vi->i_ctime = | 2694 | vi->i_atime = vi->i_mtime = vi->i_ctime = |
2695 | current_fs_time(vi->i_sb); | 2695 | current_time(vi); |
2696 | /* | 2696 | /* |
2697 | * Set the file size to 0, the ntfs inode sizes are set to 0 by | 2697 | * Set the file size to 0, the ntfs inode sizes are set to 0 by |
2698 | * the call to ntfs_init_big_inode() below. | 2698 | * the call to ntfs_init_big_inode() below. |