From patchwork Thu Nov 12 13:40:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DengChao X-Patchwork-Id: 7602341 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EC870BF90C for ; Thu, 12 Nov 2015 13:41:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B9D2206EB for ; Thu, 12 Nov 2015 13:41:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0748E206C0 for ; Thu, 12 Nov 2015 13:41:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753855AbbKLNlE (ORCPT ); Thu, 12 Nov 2015 08:41:04 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33524 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657AbbKLNlB (ORCPT ); Thu, 12 Nov 2015 08:41:01 -0500 Received: by pabfh17 with SMTP id fh17so65497048pab.0 for ; Thu, 12 Nov 2015 05:41:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=q8SVMgQDtMYHLHnYp1vT5qnXyj3uMrH4jARTGX911x8=; b=gCw/WFzF+QGzcImof2KNMzVHiahhijg11qlp0sEors8ezp423z7kQ3CAqc+P97GAsr JLuZUq+86viQET1ANNzPsSJicbfjOylh0yikOZ9ZIVg5XPsiO/Wk5I82vDKryDvnlqmp YKXaq0YBx+vjtSqocpYvkjSiVzkkjgmiDJcFJIF5zp05BR7BAy4apLqAx1BYHk/7yo7K cSrLl2GBHSvVRq3AdrB2yEB7t/nQ+PxExk+XTr+gQY8w7QBHtsJw+6CFfRuzUf4YZTC9 m2kDRnBE3XjKNHKUYNFi1WHFwxlRayLukVyEYP+dWWJD4fy11e+yeLx7FXU6et5c1mHe 6VaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=q8SVMgQDtMYHLHnYp1vT5qnXyj3uMrH4jARTGX911x8=; b=hKTcqNXQguTfCxd2ONW5q9ae4V0G7E84TUrwldz6G6R38nYwOpKLSpMD4YgGkk6uEj vc53Wh05B7/dIZdf4FuyNDxuJDbohVwM0ci45kQ8jJ1qVNON5ueGwirNpYCIeYA2PuxP UpDIbItnC1sLYD85cV/uf6Y69gxTjFWgs6FLDWt4EZpWVMOKCVRpjz+8HmOdR8HQjsuz bVLJTt8cI2CtcHeqaGTxPQSsCX0ZwNq+0w2C5Kro+m+NEmBLtAjk4/n9x+hCm6f8wqcf CumRxad6g5SSWcVcbTsHj3q/NtgprWx8vVfgnyP+v0JbhO0ijXTXRBYgSVzsgu5SRgpx +Dnw== X-Gm-Message-State: ALoCoQndfwtOvt9umIcHbh6bCSocGaBaucSb2ufr1628N2L8dqLNGfbsONwYFSUug+6z+/wICxA7 X-Received: by 10.66.227.197 with SMTP id sc5mr23321152pac.157.1447335661284; Thu, 12 Nov 2015 05:41:01 -0800 (PST) Received: from localhost.localdomain ([167.160.116.42]) by smtp.gmail.com with ESMTPSA id vk10sm288062pbc.66.2015.11.12.05.40.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Nov 2015 05:41:00 -0800 (PST) From: DengChao To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: y2038@lists.linaro.org, chao.deng@linaro.org Subject: [PATCH] fs:affs:Replace time_t with time64_t Date: Thu, 12 Nov 2015 21:40:41 +0800 Message-Id: <1447335641-14768-1-git-send-email-chao.deng@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The affs code uses "time_t" and "get_seconds()". This will cause problems on 32-bit architectures in 2038 when time_t overflows. This patch replaces them with "time64_t" and "ktime_get_real_seconds()". This patch introduces expensive 64-bit divsion in "secs_to_datestamp()", considering this function is not called so often, the cost should be acceptable. Signed-off-by: DengChao Reviewed-by: Arnd Bergmann --- fs/affs/affs.h | 2 +- fs/affs/amigaffs.c | 13 +++++++------ fs/affs/super.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/affs/affs.h b/fs/affs/affs.h index c69a87e..cc2b2ef 100644 --- a/fs/affs/affs.h +++ b/fs/affs/affs.h @@ -138,7 +138,7 @@ extern int affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh); extern int affs_remove_header(struct dentry *dentry); extern u32 affs_checksum_block(struct super_block *sb, struct buffer_head *bh); extern void affs_fix_checksum(struct super_block *sb, struct buffer_head *bh); -extern void secs_to_datestamp(time_t secs, struct affs_date *ds); +extern void secs_to_datestamp(time64_t secs, struct affs_date *ds); extern umode_t prot_to_mode(u32 prot); extern void mode_to_prot(struct inode *inode); __printf(3, 4) diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index 5fa92bc..d6c7a51 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c @@ -8,6 +8,7 @@ * Please send bug reports to: hjw@zvw.de */ +#include #include "affs.h" /* @@ -366,22 +367,22 @@ affs_fix_checksum(struct super_block *sb, struct buffer_head *bh) } void -secs_to_datestamp(time_t secs, struct affs_date *ds) +secs_to_datestamp(time64_t secs, struct affs_date *ds) { u32 days; u32 minute; + s32 rem; secs -= sys_tz.tz_minuteswest * 60 + ((8 * 365 + 2) * 24 * 60 * 60); if (secs < 0) secs = 0; - days = secs / 86400; - secs -= days * 86400; - minute = secs / 60; - secs -= minute * 60; + days = div_s64_rem(secs, 86400, &rem); + minute = rem / 60; + rem -= minute * 60; ds->days = cpu_to_be32(days); ds->mins = cpu_to_be32(minute); - ds->ticks = cpu_to_be32(secs * 50); + ds->ticks = cpu_to_be32(rem * 50); } umode_t diff --git a/fs/affs/super.c b/fs/affs/super.c index 5b50c4c..8836df5 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -32,7 +32,7 @@ affs_commit_super(struct super_block *sb, int wait) struct affs_root_tail *tail = AFFS_ROOT_TAIL(sb, bh); lock_buffer(bh); - secs_to_datestamp(get_seconds(), &tail->disk_change); + secs_to_datestamp(ktime_get_real_seconds(), &tail->disk_change); affs_fix_checksum(sb, bh); unlock_buffer(bh);