diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-07-29 15:51:47 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2018-07-29 15:51:47 -0400 |
commit | b42d1d6b5b789c41dacbe2bc192c7b359d109d7b (patch) | |
tree | e887f828b8f691a3d5530294412027ef0c9bd039 /fs/jbd2/commit.c | |
parent | 7b62b293200ffaba5b281668ba7102cb4209774f (diff) |
jbd2: replace current_kernel_time64 with ktime equivalent
jbd2 is one of the few callers of current_kernel_time64(), which
is a wrapper around ktime_get_coarse_real_ts64(). This calls the
latter directly for consistency with the rest of the kernel that
is moving to the ktime_get_ family of time accessors.
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 8de0e7723316..150cc030b4d7 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -121,7 +121,7 @@ static int journal_submit_commit_record(journal_t *journal, | |||
121 | struct commit_header *tmp; | 121 | struct commit_header *tmp; |
122 | struct buffer_head *bh; | 122 | struct buffer_head *bh; |
123 | int ret; | 123 | int ret; |
124 | struct timespec64 now = current_kernel_time64(); | 124 | struct timespec64 now; |
125 | 125 | ||
126 | *cbh = NULL; | 126 | *cbh = NULL; |
127 | 127 | ||
@@ -134,6 +134,7 @@ static int journal_submit_commit_record(journal_t *journal, | |||
134 | return 1; | 134 | return 1; |
135 | 135 | ||
136 | tmp = (struct commit_header *)bh->b_data; | 136 | tmp = (struct commit_header *)bh->b_data; |
137 | ktime_get_coarse_real_ts64(&now); | ||
137 | tmp->h_commit_sec = cpu_to_be64(now.tv_sec); | 138 | tmp->h_commit_sec = cpu_to_be64(now.tv_sec); |
138 | tmp->h_commit_nsec = cpu_to_be32(now.tv_nsec); | 139 | tmp->h_commit_nsec = cpu_to_be32(now.tv_nsec); |
139 | 140 | ||