From patchwork Tue Jun 19 15:48:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 139159 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5370412lji; Tue, 19 Jun 2018 08:49:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJLVL3HRicFGKfOhZ+M8ScJfp7dFHMCFpdkoFY4BynsetJw59Hk0LtjdUqCr1nzzhS2b4vS X-Received: by 2002:a17:902:a416:: with SMTP id p22-v6mr19556614plq.228.1529423381444; Tue, 19 Jun 2018 08:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529423381; cv=none; d=google.com; s=arc-20160816; b=SEqO13Fda/vEjIMZR9gInsxDLpYVSYtVSFqToR1cJDbf2otRCWmkSP0WHyKk3M67aJ vkifpNQ73WWbrI5Z2asggpPmmmiHHd+e77vIGsfy+sERZeEq3P7uOIz/CnysZBmmmkwn dLjIaoXy3mEgentGZ3FsaIO1FTrPiWrOSQauZaJQx569hzVCNP3zyQexHKr9zH/U4F+J D+7C8kIBf3thu3qKug41tl61PL6//t3yJueC7XaYQLYHwrBKNtEWx3ClwwP1rG82AkrE LCP1Y1CK5/SlY0uycq10G4WYmUJA1LCJ+9y4t1mUa5fBBjzjq/UWWD0iji/7q953FEmi VdmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Rq6TiJXN8LuCcq/LvlRmA30CzYuVKbvJegES8Tj3ZY4=; b=ZXJmLO0AJC83MFJNAbpv/cSZgIBfvSght3Z85jbrbAXAk+M6BYt9yrT+6I27WDdECv E0leQqVaSmlWz5KbDqJUTdxMt9cBXFJfdySNOixdQrtxedn5Q8Lh3bzqXHhBuH6c3FAs MK5MNPOD2K5qGVaFwtPTxamdTZORAYp7BfWeZ31972eBFhz2+pCIgKNL9eldzVHfTTjb A4WIprhTWp37RbzKmJSMypvR6vLzgpFFNxtSBP/WtHFuvIFVuoxKrKZsSMPvbLqOUNNU 5lkgQ2YabuPVBDsYBcUOa8TIcJ1VLcUM2FiDJeztlytAQqm/Iu/rrXLhQ9nXYHyU88GZ af6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q8-v6si288pgr.549.2018.06.19.08.49.41; Tue, 19 Jun 2018 08:49:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966953AbeFSPti (ORCPT + 30 others); Tue, 19 Jun 2018 11:49:38 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:57773 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966516AbeFSPth (ORCPT ); Tue, 19 Jun 2018 11:49:37 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MOXED-1faXXN1Yu5-005r4S; Tue, 19 Jun 2018 17:49:16 +0200 From: Arnd Bergmann To: Christoph Hellwig Cc: y2038@lists.linaro.org, Arnd Bergmann , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH] sysvfs: use ktime_get_real_seconds() for superblock stamp Date: Tue, 19 Jun 2018 17:48:58 +0200 Message-Id: <20180619154914.3859394-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:Sg7eTiDAzpyigzeqGUXSU8OqqUr67b/yzO/ewNI1FiF3wvSNyas yZz2KvobGZd9Tw1fAE3/KiA2yxo6GAgVIcAEAIPh949VSvcdmsKwJRxABsbMQ0nAPkvc34g +RiTYATRvEdyXp8Ac1YOfn4dgreXYGbJu6LorJ/YXoV1Vlng2zQaaOFDDLnrd0GzO2GsBEf A+1bvJvEPFBBF43NWs8BQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:y7GeZa4+4zA=:71Azyz0qU4AOIrdWH/olHV K7t7EcqNdM7AjJ76s1xlzuHRDmTvGRLxW3nWTXlJsGWeacVygI1gW9Kzf2Nfi6fps2yzhNXHn Hkyg3qdMQzzr+oFB03lov+Jg/9fMYouj/156XUt+eQEipMtXHUzLiTWzStsVayTZfqCdoVJD7 +5BqASpBQhOAb7EJq0zdc/zfkyWyQY3/xYntO1WgX3FOKLw7bIxjrOZbNJCtshBQ5VlsPSseO c682LpAfniqMplAczB68R6S0SIFf9aTVwqkSTwz73qaqQ5E7RDKL/7RX3AbhhyDv4ozCxfOnd /ZHz7MMzXcWVoy2r1TRdUf1zqStoOpsYi9Qs+LrDH5K5nn5E9Fwu5oByrG/61J9JaisPPFBb+ 0i909GP8Pw0cozR6aagBa6TSLupgTHJERwta4C8zRPxMR0x4NpintzfkMFaO6e29/PdbDtxiF WzdpSGbzhxtLAQc/vjr0J1pl20U1b0ji+tCyVmlqJId+F3mtuW+CudA5BoUNy1YT4C6kzNM98 tg+viRv2o4KYl7C5Z79OEVTmtyGT88YtzOGGVKMNXkl5IJW4J3vPQQCrInvAK0+hGbFF4L9mk ocO5Mv/GukSbMf7gJXLBGVN9CrhF8cq9AiNRMCDVN8fxMm+xmYTdTewdbKGcSfXOJOASMQH5s Vn63j41iuSt55tJ6MSwpZz80ulOFXgBdBqUJC6K04EMmN6yh/Gztyo+TF1F4KO6HqQLI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org get_seconds() is deprecated in favor of ktime_get_real_seconds(), which returns a 64-bit timestamp. In the SYSV file system, the superblock timestamp is only 32 bits wide, and it is used to check whether a file system is clean, so the best solution seems to be to force a wraparound and explicitly convert it to an unsigned 32-bit value. This is independent of the inode timestamps that are also 32-bit wide on disk and that come from current_time(). Signed-off-by: Arnd Bergmann --- fs/sysv/inode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 Acked-by: Thomas Gleixner diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c index bec9f79adb25..499a20a5a010 100644 --- a/fs/sysv/inode.c +++ b/fs/sysv/inode.c @@ -35,7 +35,7 @@ static int sysv_sync_fs(struct super_block *sb, int wait) { struct sysv_sb_info *sbi = SYSV_SB(sb); - unsigned long time = get_seconds(), old_time; + u32 time = (u32)ktime_get_real_seconds(), old_time; mutex_lock(&sbi->s_lock); @@ -46,8 +46,8 @@ static int sysv_sync_fs(struct super_block *sb, int wait) */ old_time = fs32_to_cpu(sbi, *sbi->s_sb_time); if (sbi->s_type == FSTYPE_SYSV4) { - if (*sbi->s_sb_state == cpu_to_fs32(sbi, 0x7c269d38 - old_time)) - *sbi->s_sb_state = cpu_to_fs32(sbi, 0x7c269d38 - time); + if (*sbi->s_sb_state == cpu_to_fs32(sbi, 0x7c269d38u - old_time)) + *sbi->s_sb_state = cpu_to_fs32(sbi, 0x7c269d38u - time); *sbi->s_sb_time = cpu_to_fs32(sbi, time); mark_buffer_dirty(sbi->s_bh2); }