From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933766AbcFQPhq (ORCPT ); Fri, 17 Jun 2016 11:37:46 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:55084 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932406AbcFQPho (ORCPT ); Fri, 17 Jun 2016 11:37:44 -0400 From: Arnd Bergmann To: "Theodore Ts'o" , Jan Kara Cc: y2038@lists.linaro.org, Arnd Bergmann , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] jbd2: make journal y2038 safe Date: Fri, 17 Jun 2016 17:39:00 +0200 Message-Id: <20160617153916.444842-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:4LgxEnzJe9Ruu4zZrWJggRGnVDGWHKkICj+2bH+UQoZbJGwPPMm sFMjbYKuRjbYAE0OGn0R5FC8M9LjiuaJImgsQdX5yGjTc9yYG1LWMS1DGVdz7mmyBMSdgIh vOU2xWD3ntIzeFWZIE+shVnAKAX9SlY0TxtBQnoXF8jZfpI5B3mlI5L4HgpFyFFJ648rHZp YXDGYS1Eg9eKKM5qXO8PQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:ATYUnP9IirQ=:Pk7WkABJbtpAKkB391Zjhy gJzTF8sr7AvcXufkwyYGv05Rq4y6Ytkl+QjSLUgrGtcxMxNoSRH5bmwJSZ0jJxJGwOaAGPYqN jrAmOd7lLpz/isZQplDCBZhavhQ/ps/8uYfXHIwtcezuxTixsTnPte7hqm8QoCmwU0cigS97j eZRnD9Ir91QcEQMWnXYZXoxK6N4iJofspqczqqqhv/7ORUjVXyy6YGohVgylORzYuNF6ZHc8W BwUocywfGqxiRYZyPDhIW6a8/zspx06qdA+Hy0qwz1uXugxFhsmRJcMngzLgC9m8BWLBOkxL2 +yC6Wd/luh+aN4vGDb7Nl7hYojRS8By/Mnr/9ltkuaKmfTHc3o0o6baefjgCKnPKO0/EbYOxT FCV3p0j9OvHfzA0cR5aYI0DN2N5E3phqhBcBEwgudkRAjAG+soJDeFHGfQr+shF/u4tQVefl+ aAVtyAQKHk0M1IRau/6E07YvF7FK6poL0gdgGmZFHPxM88yt7akQwizFtcN96i8OtiEYcZD7J l4aYQqI+ZP4N+Qcy30OAQY54e32SdbHNeb4NjmuD3URgA6SiqBXW/Yz69VUqLwbQ+P76lRW3a cxn0UG7cP0NnZJfozaZR4eU0ZinE3ouvYzkgLCFoB0AS2/sQ8W4Ftom2Pk5jDEAB5Mt9BbduB rW+3IKISMLmhCc5prayBxkjpVZUBgc0b9c/Eh745DsbAXCKERLROLPqkPDYhvY8EG6Jc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- fs/jbd2/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 8f7d1339c973..5bb565f9989c 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; -- 2.9.0