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/ceph/file.c | |
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/ceph/file.c')
-rw-r--r-- | fs/ceph/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 0f5375d8e030..a37a343fbd0f 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c | |||
@@ -886,7 +886,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, | |||
886 | int num_pages = 0; | 886 | int num_pages = 0; |
887 | int flags; | 887 | int flags; |
888 | int ret; | 888 | int ret; |
889 | struct timespec mtime = current_fs_time(inode->i_sb); | 889 | struct timespec mtime = current_time(inode); |
890 | size_t count = iov_iter_count(iter); | 890 | size_t count = iov_iter_count(iter); |
891 | loff_t pos = iocb->ki_pos; | 891 | loff_t pos = iocb->ki_pos; |
892 | bool write = iov_iter_rw(iter) == WRITE; | 892 | bool write = iov_iter_rw(iter) == WRITE; |
@@ -1091,7 +1091,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, | |||
1091 | int flags; | 1091 | int flags; |
1092 | int check_caps = 0; | 1092 | int check_caps = 0; |
1093 | int ret; | 1093 | int ret; |
1094 | struct timespec mtime = current_fs_time(inode->i_sb); | 1094 | struct timespec mtime = current_time(inode); |
1095 | size_t count = iov_iter_count(from); | 1095 | size_t count = iov_iter_count(from); |
1096 | 1096 | ||
1097 | if (ceph_snap(file_inode(file)) != CEPH_NOSNAP) | 1097 | if (ceph_snap(file_inode(file)) != CEPH_NOSNAP) |