From patchwork Wed Jul 11 09:14:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 141699 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp48232ljj; Wed, 11 Jul 2018 02:14:58 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc47vik+0e0HUBwNl/b/48MSP6YwJPJhURSbHOcbphx10Hja39iwcIWd4Xd9fj0N71aVxkM X-Received: by 2002:a62:9541:: with SMTP id p62-v6mr29068885pfd.152.1531300497953; Wed, 11 Jul 2018 02:14:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531300497; cv=none; d=google.com; s=arc-20160816; b=b4V4T+dkXNBkPuosQBJdrlAm5DvBXVA9FvQBU1iduqj/9zlY62IXklIFlHu+1CEkxq RLb8ENNr0xvEyVP+7Rt9w965GTnrd22yzpFBMcCzQNSXJ8kieY/szQWt+Ca6atkHxhgw QXtEZbl1On/kHywQOAtOcwFWGWqi4wTUZx15R/ETguAyUEsaLaA3KeSL5A4UAViWh+DR F1fIQws6jbg44TfVlmp0riPXKdLjAs1hqs3dE864psBqrjilg0LtuwgUvGuCWxlLGgFl w7AwFI1+eGo2zrEnmHvY0edvmyAb4NKNC2AQh1nAkR5wzdGwhpr/YhQRa9mbI5JaFE1b fDtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=J0nt/QHDSR4+3EZ89pw0hSW/kzrHFEjgONoh7pawe2E=; b=pvLV4KGLoVX/dx/2jOjFxiW4wEx23TX6/7G7Q9ZUek11Ijui3CsPcHX3mSQrCRhi9p kMxu8hIGrjFp4YYW4oZVZ5UcflfSLLpN7IaECrf+317vXesngdLWqANK2XaYucV8s1Je P47fzgpDMssZL24rafUtYdF489PeHIaEC5S29Baot+da4BgkN6GWY0/Q1mOY17MAKEQR 1vihm3uDjY77NKFYc5EIvkKhOF29Ixs3GWRd2ul5J/9GXgtOPDLplzr1/vf+UNKHfjVG VhYL8VONj/xWKN9k+cTCgAAFv52IeCSLRfHW/IjgNgPYjp4RgTjjfsSzqPpJXAI3Hbx9 d4Cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 g35-v6si15861625pgm.54.2018.07.11.02.14.57; Wed, 11 Jul 2018 02:14:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732497AbeGKJSP (ORCPT + 13 others); Wed, 11 Jul 2018 05:18:15 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:48621 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732366AbeGKJSO (ORCPT ); Wed, 11 Jul 2018 05:18:14 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MeBaA-1fRZZv2gqk-00PvCC; Wed, 11 Jul 2018 11:14:49 +0200 From: Arnd Bergmann To: adilger.kernel@dilger.ca Cc: arnd@arndb.de, jack@suse.cz, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, sirmy15@gmail.com, stable@vger.kernel.org, tgnottingham@gmail.com, tytso@mit.edu, y2038@lists.linaro.org Subject: [PATCH v2 3/6] ext4: use ktime_get_real_seconds for i_dtime Date: Wed, 11 Jul 2018 11:14:11 +0200 Message-Id: <20180711091414.1494843-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180711091414.1494843-1-arnd@arndb.de> References: <20180711091414.1494843-1-arnd@arndb.de> X-Provags-ID: V03:K1:aLZZDLe4yh9mM/SxxZyq83TZgByo8/3I999hKbspb10a+AXFU3A vKFh9z44EXJwcmC7zLSDiyqiBL67c9CZ7SqDIAG5nbOwcjS0fqtEFsdJmn5ck5ssz40FPEd EmZv4J4TZ4LiTuW9RudvUaclouFuj5C7q4HjqodyZt5+JFDbkJV7Yp0I/HpOgOROrSx2zP7 9HgMNbB9sIF5HfrjX0VXQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:pLJ0P+786jA=:Nz5demrXIadNQ/i7ERRua8 KKWf+iPFJHwtQH5E4HrAJ078q2cfj4rtDTk2TJGTr3raClkDqz5YVs+3zMhKWsAR2Mixql3Os 8rvY6RX9yV8vrrUqKnYBNZkDrt34L7UAMPotPdAyv49ky9zn9PbdGIGIF6KuAxIEeO50PeHlX 8yGyi0sn3OhRxoUzHJWCkIQlaNCBbLnDlmSCGUrOCYqz6L6TESyHBX9K/fUDtGm7gTKNteh8y F4jRiwv6jzH0/nameYSOEk6RXo2L42DQosx5SHPVestayI1Jq9LFr/0zi7L6by4UyziAKxNMy T7mPCMBhTvEZdTbwvJ5uor7SRs4G+nIprLSDwhWKzNnwhsxUQFQEqAORCRET06QhmhEYiZkri CeVeN4YMkccPQEkY4WvOfFpdv1C6y2DQ7fPBgE6tvouQHWlzyIDD5gd+RehB9NQ2ArDLggnfF 8pHgvhnhwydjzpw0toB6F1ACpya8femVj6gMeqxIYD4+QdxBzeYHuYJqRU1UPpau3mMvF0gMA hUsNcz7hLmGmrGMuiCtMF6Hem4FLPSstfGMKC0N9fHf11Ug2Adg0g4sozSWvTG+UZhspUCuml MdkkAj7FyL6S0PgKh93/FwKd11BSNFteTX4Z2NdBgszcWu9p7CEa1KemNp5HxgtciG9j4JuPv xW8LfLvOu2xYSF8q3G6/2OoBmUVCBx4qjoCy1RbmFB/s27jZOSLmKZilfkNInY/C4lDY= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org We only care about the low 32-bit for i_dtime as explained in commit b5f515735bea ("ext4: avoid Y2038 overflow in recently_deleted()"), so the use of get_seconds() is correct here, but that function is getting removed in the process of the y2038 fixes, so let's use the modern ktime_get_real_seconds() here. Reviewed-by: Andreas Dilger Signed-off-by: Arnd Bergmann --- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 74982a9566a9..3b54227cf2b1 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -317,7 +317,7 @@ void ext4_evict_inode(struct inode *inode) * (Well, we could do this if we need to, but heck - it works) */ ext4_orphan_del(handle, inode); - EXT4_I(inode)->i_dtime = get_seconds(); + EXT4_I(inode)->i_dtime = (__u32)ktime_get_real_seconds(); /* * One subtle ordering requirement: if anything has gone wrong