From patchwork Wed Jun 20 14:34:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 139354 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp868341lji; Wed, 20 Jun 2018 07:36:01 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLxlbXMfwuJxDWfA+O0ilmaq2DERG99ARfL8K5OA4P+jtxjdBblFhaBe2sKmS+R9GK+FXkF X-Received: by 2002:a62:d09:: with SMTP id v9-v6mr22850654pfi.163.1529505361757; Wed, 20 Jun 2018 07:36:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529505361; cv=none; d=google.com; s=arc-20160816; b=F4iFUyWoN8oad7p/oZxynQVEUG49BnVrmbUiyvbeEAeYG0UA+2P5nkcGgkPp8axA9D t6ws/VNEHwrdt6vqrVYdqBGiJt7lCz6q8QJLmVybwsk6g6jwttOwMRvydl5yVV7ECKj5 QJk9PJPEu+GRpsLUJRh+eKWTAlCoUJoikKWq6eg8K5PDrpgyZ2m5EE/RcNa/5IpT09fC v/Bwjra+IvmluEeFZVoSIJrZ4wmL/oOBNqDOQd3lAbg5jyem/MN5UCNeO5DTOAgg8H9B Ujz4+1tfr3OzeuxromestzmFdDpuwvS+nNRXbmqSVYoz4fNcPixNeJ52iXczt46ipfMJ Ue6w== 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=FKgU0lWxK6ZAmLhwll/oVP1f/sDtMlokeYsjPcVIVRY=; b=iUlC5ln3RaZ2jFWa2ckQAsvD7Nbl+MO98xOnqp3pvnyTNxnxKL5zwtIJZ/npja2DSw g12DNE/LSZkxERu03AIJKWc6SF7REIn4Nn/7fqdA1s2ofUBUMyXY6WbHuxs1TMrJaOWh 3+juya1hpVrOTo8AD6PBptvd9Ei+F4yq7X1I9L52abR/djg23N38wKQlXxXYExOYZSHF od9TA6WuctVH3tNmoQ1mOd1k6PRgVVjFL8wjT/SagVShkNU9yomDkQbIy8uwYWanJcS1 Oz5UmtZxxtg73wMTYUrtDMOHHx5s7S5P/IlgWgzdEHOYHo7mrOEmysJ0+VFu7OiUHAbk dXaQ== 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 y2-v6si2519441plk.473.2018.06.20.07.36.01; Wed, 20 Jun 2018 07:36:01 -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 S1754207AbeFTOf7 (ORCPT + 30 others); Wed, 20 Jun 2018 10:35:59 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:57985 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbeFTOf6 (ORCPT ); Wed, 20 Jun 2018 10:35:58 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MgI6w-1fs8dU01YM-00Ng8S; Wed, 20 Jun 2018 16:35:18 +0200 From: Arnd Bergmann To: Chris Mason , Josef Bacik , David Sterba Cc: y2038@lists.linaro.org, Arnd Bergmann , Nikolay Borisov , Omar Sandoval , Liu Bo , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] btrfs: use timespec64 for i_otime Date: Wed, 20 Jun 2018 16:34:34 +0200 Message-Id: <20180620143448.44388-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180620143448.44388-1-arnd@arndb.de> References: <20180620143448.44388-1-arnd@arndb.de> X-Provags-ID: V03:K1:64ae6ej6GWDaggWWkac+lHArkwY6qkKHJYloNUh0uQoskF5Sy9d PZtYjHqS5RdsWDG1vADqfPLQi0dbEYcH2Z0/FeKvLx0ubpjSE3LVBungbhI1INYBaTlAHRA aW4gU8WEKHEdUcp8isDxNTCOQ1O+V+3BBJNE0N58wv8rG9HTQNKQpuirUMdbOW+RaHVgaKa 7PPL2VD7C125eoKtNhkOg== X-UI-Out-Filterresults: notjunk:1; V01:K0:MH9aXRGwem0=:Gpxc20+tA3ANirFW1kpcLT racVDbqcZfdsq6Fo9GRqH1X4466q9qJRnyQHDKc+DAQpoGgpEdiaEeWM7ZXlB9i3SieXAvMAU cQiuQofIXJhN1faaANTEkt57OlFv1hQWxWtiW80QmWFY4MpkynG3QkuHXFxlvKcHX/zOj1eaB JOvSZFDv04Pi52D34HI4uafWK1bIQbcX9litevOJlTFr/5FtxNb0lxAWp7fQiEa3UexTdxOf/ QxUqK0u1aRFak7nixQ8PZ53Xhhx/DherDjZqgfNFS5VPZr3o/GSejhfj+YIooTVpHrZkrnxgW mASiAsmv502XfzSGMR+kHp3olZwRmgB2VzQoNgI0XvCh5qOmN01Ljwn9jTQv+srAb/WeKGp4J iF7tjsdpPvphZuv6TOAC3CjaCQSdr2oLkqpyDP+dHXcRrYAwH0uan0+bK0eWX1c9NvVTOpTgd Xm/2x9vVCwOQSV7HFwc0gjSs6bqYBHaEgitMsrZq8yuA5xyjuLC7BeU99utZ09bLnKmWtaI4h 6jVdDl4QihWJHZw9Fe/aeGgkwoBlzSuJ3QigvXTWFbY5KXPSwa6LpF0rhDU06Emw7ZhxCPN2g kkl2zwKT8AALNwBoqZGpuCxROcv3YXB/Z3ibErqNxjzAQyoBLNGTXSGq2apJroQjBjKEkhfD9 cULHRfzcJ7xqrm7sJywvS3a/7UT0wJWWgXyPbx+R0AqbLHUfH6CqbRY8cWLm1yxygavs= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While the regular inode timestamps all use timespec64 now, the i_otime field is btrfs specific and still needs to be converted to correctly represent times beyond 2038. Signed-off-by: Arnd Bergmann --- fs/btrfs/btrfs_inode.h | 2 +- fs/btrfs/inode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 7e075343daa5..1343ac57b438 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -178,7 +178,7 @@ struct btrfs_inode { struct btrfs_delayed_node *delayed_node; /* File creation time. */ - struct timespec i_otime; + struct timespec64 i_otime; /* Hook into fs_info->delayed_iputs */ struct list_head delayed_iput; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index e9482f0db9d0..22dcc8afd38f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5745,7 +5745,7 @@ static struct inode *new_simple_dir(struct super_block *s, inode->i_mtime = current_time(inode); inode->i_atime = inode->i_mtime; inode->i_ctime = inode->i_mtime; - BTRFS_I(inode)->i_otime = timespec64_to_timespec(inode->i_mtime); + BTRFS_I(inode)->i_otime = inode->i_mtime; return inode; } @@ -6349,7 +6349,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, inode->i_mtime = current_time(inode); inode->i_atime = inode->i_mtime; inode->i_ctime = inode->i_mtime; - BTRFS_I(inode)->i_otime = timespec64_to_timespec(inode->i_mtime); + BTRFS_I(inode)->i_otime = inode->i_mtime; inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0], struct btrfs_inode_item);