summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-06-30 11:49:01 -0400
committerTheodore Ts'o <tytso@mit.edu>2016-06-30 11:49:01 -0400
commitabcfb5d979892fc8b12574551fc907c05fe1b11b (patch)
tree5bdd54e240a549eb4a5b4b9cd6beff257dd75865
parent1eaa566d368b214d99cbb973647c1b0b8102a9ae (diff)
downloadop-kernel-dev-abcfb5d979892fc8b12574551fc907c05fe1b11b.zip
op-kernel-dev-abcfb5d979892fc8b12574551fc907c05fe1b11b.tar.gz
jbd2: make journal y2038 safe
The jbd2 journal stores the commit time in 64-bit seconds and 32-bit nanoseconds, which avoids an overflow in 2038, but it gets the numbers from current_kernel_time(), which uses 'long' seconds on 32-bit architectures. This simply changes the code to call current_kernel_time64() so we use 64-bit seconds consistently. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Jan Kara <jack@suse.cz> Cc: stable@vger.kernel.org
-rw-r--r--fs/jbd2/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 7007809..78313ad 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -124,7 +124,7 @@ static int journal_submit_commit_record(journal_t *journal,
struct commit_header *tmp;
struct buffer_head *bh;
int ret;
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
*cbh = NULL;
OpenPOWER on IntegriCloud