Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp3167736rdh; Thu, 28 Sep 2023 04:58:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpfhsdW/qjboM4WN5b4t4apf3gKTP5FhzLXzuzA6khUoY1uqVec1K/drb3Z9L/aYIUrM3o X-Received: by 2002:a81:5f03:0:b0:59b:f18b:efa0 with SMTP id t3-20020a815f03000000b0059bf18befa0mr991855ywb.36.1695902284509; Thu, 28 Sep 2023 04:58:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695902284; cv=none; d=google.com; s=arc-20160816; b=khrPecGxIVekq7jsCI4NNAMfM+lFGWYG/et4bo/1S8qxZQgglYdXHkCQWIhg0l089R 5uxshI0zY7EkwgHTJV77XDkvzPofAo/ca9ZxIka7Ibps6ZHw1jm49KXvYsfRz4tteRKu w2ddhXR/R9oiN/0yCewgaRy8Rz0bEfCxuLJnaCNBcB9+26SLcODdejCDeVpQfn5Yag5h qQ8KvDvpePBofUdsvBi9vk7CjPygZZ0r8gtaneE/FoI6ns2MNdmm0/sD4r0C4sc+AQIg tc5NuQ9/Wf3WCWnDHbPem8jo54EqSnN2VsvBxP1KTI924Z9y1R90qaW9sFTHAbdEpZ93 eK2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X/fiSlydr1cybYlcmV12YEcX2BfE/eB/w2jJLp1KKt0=; fh=KZ2Ejrdjn3st4YZfYh/U6JH5wVhYC1lVTNFXDG/+XsQ=; b=t2NDBx2L3kKdYICVqoO/pC4Jz3a8u15LBTCNkaQVp5H+0i1TF4nXj0qWNbvfsfCr6I lll9zeFRL53bwHzD5RK9iuLlFKpLPK74SsZRpX8fbJ6wZwA++utKhuyY2nPjQ07kc0SO 8sAP5FXxJlmP1ZadsdDNIe3GbSWdwqs+DlQJ7WdzdvuD/BVKEdqyeY9E3WIvgyqWYLWB UY/bdL1lXyfjx9pBiClLFCoVdma/0Avfn0G26jllq2K2N86L13p2BavT9k8R/2I1HBuJ yh+YkUXd2Jnrbg9KP/iwCxYbuo9eNeQYkgfCUxpjpeWL2DOLJ4SuSyg0aCX65wXQAZTc oSCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MFe0YWnh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id c5-20020a6566c5000000b00584b74b26e2si7878101pgw.497.2023.09.28.04.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 04:58:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MFe0YWnh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id A465A807D8CC; Thu, 28 Sep 2023 04:19:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232240AbjI1LTm (ORCPT + 99 others); Thu, 28 Sep 2023 07:19:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232018AbjI1LTJ (ORCPT ); Thu, 28 Sep 2023 07:19:09 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 221E52D6A; Thu, 28 Sep 2023 04:05:48 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EB49C433CB; Thu, 28 Sep 2023 11:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695899145; bh=kDD770rcYrkIWsan1bLDTDkXiPkbBnLU7OCnjmn7X9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MFe0YWnhGqAih6g9LXYbcn84RWrbun1ZpctoHzGu+t+jXDKW5Ei8hWmm1+km0gawC SbtiopF5ZN8u51O+ayLfiMVh7dwUcF1e3a7vMJVKYyYY4X2ZuGn4+9AybUAPWkOZAI ntW5ad8Y02rmNiTc5C5iDXGBBc7D84Ua4mu2xGUJhoz4eW4UL9exkBIDnrv4xt9vA9 S8hxN9G7zt8Tj+Tc01UjWm/5D7CiHCZD6M5f+89efatnHpbSLc6ieWkoyBO4BtD1yr NwUQHDib2Edxq+za2H1SP/Rc/t4gOJKRbJX05vQmdZ7WAwHzvSFItPm87lu7wm8NsJ OQYAQm/Z6Okfg== From: Jeff Layton To: Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Johannes Thumshirn Subject: [PATCH 77/87] fs/zonefs: convert to new inode {a,m}time accessors Date: Thu, 28 Sep 2023 07:03:26 -0400 Message-ID: <20230928110413.33032-76-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org> References: <20230928110300.32891-1-jlayton@kernel.org> <20230928110413.33032-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 28 Sep 2023 04:19:54 -0700 (PDT) Signed-off-by: Jeff Layton --- fs/zonefs/super.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c index 9d1a9808fbbb..e6a75401677d 100644 --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -658,8 +658,8 @@ static struct inode *zonefs_get_file_inode(struct inode *dir, inode->i_ino = ino; inode->i_mode = z->z_mode; - inode->i_mtime = inode->i_atime = inode_set_ctime_to_ts(inode, - inode_get_ctime(dir)); + inode_set_mtime_to_ts(inode, + inode_set_atime_to_ts(inode, inode_set_ctime_to_ts(inode, inode_get_ctime(dir)))); inode->i_uid = z->z_uid; inode->i_gid = z->z_gid; inode->i_size = z->z_wpoffset; @@ -695,8 +695,8 @@ static struct inode *zonefs_get_zgroup_inode(struct super_block *sb, inode->i_ino = ino; inode_init_owner(&nop_mnt_idmap, inode, root, S_IFDIR | 0555); inode->i_size = sbi->s_zgroup[ztype].g_nr_zones; - inode->i_mtime = inode->i_atime = inode_set_ctime_to_ts(inode, - inode_get_ctime(root)); + inode_set_mtime_to_ts(inode, + inode_set_atime_to_ts(inode, inode_set_ctime_to_ts(inode, inode_get_ctime(root)))); inode->i_private = &sbi->s_zgroup[ztype]; set_nlink(inode, 2); @@ -1319,7 +1319,7 @@ static int zonefs_fill_super(struct super_block *sb, void *data, int silent) inode->i_ino = bdev_nr_zones(sb->s_bdev); inode->i_mode = S_IFDIR | 0555; - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_op = &zonefs_dir_inode_operations; inode->i_fop = &zonefs_dir_operations; inode->i_size = 2; -- 2.41.0