From patchwork Wed Jun 20 15:33:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 139359 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp933853lji; Wed, 20 Jun 2018 08:34:47 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJLuXYyuylTzS0w4T7pGQdCvHXTdXRECvmLy+zwyfmTHY7jknEVAoLG0K2EjdZpc4mGu4ZY X-Received: by 2002:a63:8c4f:: with SMTP id q15-v6mr19652012pgn.236.1529508886907; Wed, 20 Jun 2018 08:34:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529508886; cv=none; d=google.com; s=arc-20160816; b=kUdBW09Kd+0ZlvMFsm9b1+5oIF5KaH99DbRUiHqh/T3ud1JfRjDkl8s+2O/Ki5PIS7 SmQXfu4JD77yneeeaQzUQNpAs0Mm+3VXZLGoQR8zvKuL7GunNixdkI6AKyAmpVsUkN3D BLXI+TkaYtdpnCbIZ/Jre3Sz6O4wCRqVlpXk0qcl3UFaLTEr3d2F9f7fwHlAbSVGN51v ofdoDidMRYoJQwpv8lN5WZbNIG9dVQ2rRMPZW8HX0WzqPFK/5N7IA+jIpWYhOlRc54+q gs2u/NCkfy9ZsqDRx1ismyRv69Qq3efK+nSskAX/+oeGkc1xN3GCsNhcRsKpLrIPJPCi ldng== 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=3Htz+CMutx07wIVPTQLshfUxgUrJaZtTfeW23HF3XbI=; b=St9CjZl1r5iaknsr3mCxND9nLqUoPChHg2qhNM2GiqPJlgNlfDp1kW2kYLxrpBa22K 9dVZXAwypdlbp7DxmzhfbI2ImUbQTQC9qgzGvHOVwhdB60cm7r/KSVTJXXiYq2Qd5gCH IIxzvQCXdpn/kWvaogkKef1CyQkHhUlRPEYb6PBXt2W4g0BKz/z6e+WNn9ZZ+G7SXq5E f33LYBzJN0EO2ISXljTcgxDHCgJHCluU/cPr2UYRwsjZDquMKcztMj50fhrNL5n+GKXp U4FkC1rWmr+HyHrI+Hwc98rEUoIUw8fVE8tYj/IqTlldccLT5rPEqN2RqNEGNt+n0GwM Ib6Q== 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 3-v6si2748244pla.418.2018.06.20.08.34.46; Wed, 20 Jun 2018 08:34:46 -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 S1754358AbeFTPeo (ORCPT + 30 others); Wed, 20 Jun 2018 11:34:44 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:44891 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754297AbeFTPem (ORCPT ); Wed, 20 Jun 2018 11:34:42 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LfbNC-1fxnnW2sKQ-00pOJ3; Wed, 20 Jun 2018 17:33:52 +0200 From: Arnd Bergmann To: Theodore Ts'o , Andreas Dilger , Jan Kara Cc: y2038@lists.linaro.org, linux-ext4@vger.kernel.org, Arnd Bergmann , Jan Kara , Tahsin Erdogan , Miao Xie , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] ext4: use ktime_get_real_seconds for i_dtime Date: Wed, 20 Jun 2018 17:33:00 +0200 Message-Id: <20180620153322.54221-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180620153322.54221-1-arnd@arndb.de> References: <20180620153322.54221-1-arnd@arndb.de> X-Provags-ID: V03:K1:77Ay0kvre9eEXCP+7Do73N197ZmQxp5tyy1w2ShvryDjGW1P4ch qaJlRiiAdnYXZlKeR1LgS8cGfEM1E9RM2fDvIq0xasKmeimbIB9rzstYuoTOLeHj++Uw+7T 3hFwXrhTVF35vaTkO38GzWnKZstwH2ukIIlWG9zcZbYHAye1xEPwYx7AYP6QkuACwsnR15m +BCN6jFfXo3hlxvvLU5ZA== X-UI-Out-Filterresults: notjunk:1; V01:K0:btxtYbaX/6A=:bCChF3C9ZVKhZE2XXftEkB Fi4hlG8aVieyETiVBXUvLVkL5iyp78KSXQyaWbwuQVtzXrHlWrCRrlm2YJAInyZ/6wKLWZQsk ws6hdaF9R3wa17wN+bMqSQ+rh66cXh4VklJbXqcK8Z/qC+rQcwW2SC1oSlkFxWoO719EGO1PI P8F0sINc7MQXPpDgJn7MH0Nif8TE2DK3tm8H2Xl10QULk0hlwpf24bigw9WS8MLLU5BnJuldf 5LGT48+8N3priqHIQHwmtVcrhfJa560jFNBpzW2FrN5gNx4pd0yRQppZkOTf1glmMCLGVyB6n V1dkTMS2x95hrdUPHq55hGCwuG5LvfH5l034wgFdM6DcMHEGvYZEsDFznQuKEp3Dn6a/fRpDY 8qSsVsAAEVesTCD/fTaDMKZ827xKHfE6QFfsnUKtkEbx4WNE5gxRNQ3lIQ3u6JmNYMBMvYSTU TCdNhP6cAyOx4qSpTaNt9LW9WjoDR9dScm7Nx2IMbfqDCGDfDvQcICu5cfb5aHlh+/mLC0A/g TLugKh0z11nqubHdF8+UvUzkektyO0xfQuX0H6zH0Bm1xMao9NcZ0Jwq6yHjfNyYLq3guPob/ meRjplQwRUloTBzmvEEXfmwpVOPM4KDC1zdwYEpXFMPJoXwmnCJuCmNSBnZrmO7hmsv3QzyZO 4oJdxRH/Jma2tNBCNTW2Y9D8TKsLlLbzgcLLJjFhWOFEKgzmbRtEnwLg6tuVf/gapM6g= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. Signed-off-by: Arnd Bergmann --- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 Reviewed-by: Andreas Dilger diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 2ea07efbe016..600e2063d1df 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 = ktime_get_real_seconds(); /* * One subtle ordering requirement: if anything has gone wrong