Skip to content

Commit

Permalink
jbd2: make journal y2038 safe
Browse files Browse the repository at this point in the history
BugLink: http://bugs.launchpad.net/bugs/1615620

commit abcfb5d upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
  • Loading branch information
arndb authored and kamalmostafa committed Aug 22, 2016
1 parent 69dbee1 commit 1ee3cee
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/jbd2/commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 1ee3cee

Please sign in to comment.