From patchwork Wed Jun 21 14:45:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 111116 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4443879vqr; Wed, 21 Jun 2023 08:21:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ54l1eftDovR4YswlHlGrMVDHngd1hEYtb49SYAsSups1GJCh7SpyEwEXLD66s8n3jkhc0N X-Received: by 2002:a05:6a00:1392:b0:650:154:8bd with SMTP id t18-20020a056a00139200b00650015408bdmr19797706pfg.17.1687360883843; Wed, 21 Jun 2023 08:21:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687360883; cv=none; d=google.com; s=arc-20160816; b=mjOTuWtS6K6vOMQU6K/fUbK8YABRTSdzFfd7CLJRBXRJ37TXAaoXyZtBI2KaRqfLIN +LhZ+xwfndXlap2MpIVsC0u65ARKtJS39NBID+/ELrGf3R5snUqNi1FzAZfMUmYn10zF memx27rGywk0VBR/7mjRGLvnK9dRQzo9Cn8n2uAHWMYcdEUKXewwAoqo0xx+PdPvwro8 Mym70goXrNnACxom63aqVDgfoKgcPH2LO0xkjN+sX6tf7NDTnYDkc9hQvi6k2Sc/QBEa QWEc7+mj0jpOQWgRSF0LHC/kSEOWUKhkHivuF7c2NRdQC7SQvS0GiV60Ki3aB047Wcij AO8A== 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=pctME2YYzFkThuLrWo2qIVNWLmOvIbRpyAiY9cKzFpU=; b=CCDIxg4ZfFzvDMgESwx4ai9P/ChJm7bAhQAvIOMboVEDw0eLcR9BXbevutS9xF6sTK bGVWgvzWuq6jjclBvqnZgNYlfl7m0wPxIW/YXLEGBElqitt3VZCrA3VCH0vNqND8BhOr RNap2jhno4Sw/H5BZ1WCCc001bmEyDLzXhhlAVfoejPU55E1OfV2JxYPK+3O0J5OBLpF 736Y8Wh43A2FmmvlyVJeDX04TDd+Cu8NFo0SJLYChT0uFSJ9xMg+yjOkNXk2EVn9JJ52 7AZOQ7TbzAvCmANGes5+0ofckohEslWWyTgcej4OWijtreC7gI3CNkCxi2UyH1ZL7/up s1Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Wsb3/uGF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e18-20020aa79812000000b0064f50a4a515si4133693pfl.37.2023.06.21.08.21.11; Wed, 21 Jun 2023 08:21:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Wsb3/uGF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232875AbjFUOwV (ORCPT + 99 others); Wed, 21 Jun 2023 10:52:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232443AbjFUOup (ORCPT ); Wed, 21 Jun 2023 10:50:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F182296F; Wed, 21 Jun 2023 07:48:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AD281615AA; Wed, 21 Jun 2023 14:48:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96814C433C0; Wed, 21 Jun 2023 14:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687358924; bh=GOlvR7zQkP7YHCqLCSL4MnqspCPui1thTIrZ1lMD+xI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wsb3/uGFyYqh0KgV+TN+qB/TlZ2sZd6ovf4WfWNqA8JQnuDvnSzMOUdqU0zoBDbEf dUR/HCHZjRG9dNvEVI1c+lOhVQXDyIEvXlY3KT7lqWcLF0k8A2rMJ4oRQgbOeqDxlD 5jDAkLbRIM7IQ8p3Up+GGS4QqcfdwshnDnmCGOjgxT5Uqskcm/eBTyO4pGNpY8cd9s er2KDyHUPq9eA7XFuZ2awoe6+6SH6BoJlPDxdxyT0iIq94m7puHa0Q8kL+ayaEpg5V mtYdjXz2jYR55HIrd+XbwOYfEcddFITlwR6hye7VUTFKnhSSHD0LqyRUEfU2eld15q jN2SKRYjLQQNg== From: Jeff Layton To: Christian Brauner , Jan Kara Cc: Al Viro , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 40/79] isofs: switch to new ctime accessors Date: Wed, 21 Jun 2023 10:45:53 -0400 Message-ID: <20230621144735.55953-39-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230621144735.55953-1-jlayton@kernel.org> References: <20230621144507.55591-1-jlayton@kernel.org> <20230621144735.55953-1-jlayton@kernel.org> MIME-Version: 1.0 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,T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769326126337549487?= X-GMAIL-MSGID: =?utf-8?q?1769326126337549487?= In later patches, we're going to change how the ctime.tv_nsec field is utilized. Switch to using accessor functions instead of raw accesses of inode->i_ctime. Signed-off-by: Jeff Layton --- fs/isofs/inode.c | 4 ++-- fs/isofs/rock.c | 16 +++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index df9d70588b60..035fa0271d6e 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -1425,10 +1425,10 @@ static int isofs_read_inode(struct inode *inode, int relocated) inode->i_mtime.tv_sec = inode->i_atime.tv_sec = - inode->i_ctime.tv_sec = iso_date(de->date, high_sierra); + inode_ctime_set_sec(inode, iso_date(de->date, high_sierra)); inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = - inode->i_ctime.tv_nsec = 0; + inode_ctime_set_nsec(inode, 0); ei->i_first_extent = (isonum_733(de->extent) + isonum_711(de->ext_attr_length)); diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c index 48f58c6c9e69..6b7f2a62124d 100644 --- a/fs/isofs/rock.c +++ b/fs/isofs/rock.c @@ -421,10 +421,9 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de, /* Rock ridge never appears on a High Sierra disk */ cnt = 0; if (rr->u.TF.flags & TF_CREATE) { - inode->i_ctime.tv_sec = - iso_date(rr->u.TF.times[cnt++].time, - 0); - inode->i_ctime.tv_nsec = 0; + inode_ctime_set_sec(inode, + iso_date(rr->u.TF.times[cnt++].time, 0)); + inode_ctime_set_nsec(inode, 0); } if (rr->u.TF.flags & TF_MODIFY) { inode->i_mtime.tv_sec = @@ -439,10 +438,9 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de, inode->i_atime.tv_nsec = 0; } if (rr->u.TF.flags & TF_ATTRIBUTES) { - inode->i_ctime.tv_sec = - iso_date(rr->u.TF.times[cnt++].time, - 0); - inode->i_ctime.tv_nsec = 0; + inode_ctime_set_sec(inode, + iso_date(rr->u.TF.times[cnt++].time, 0)); + inode_ctime_set_nsec(inode, 0); } break; case SIG('S', 'L'): @@ -534,7 +532,7 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de, inode->i_size = reloc->i_size; inode->i_blocks = reloc->i_blocks; inode->i_atime = reloc->i_atime; - inode->i_ctime = reloc->i_ctime; + inode_ctime_set(inode, inode_ctime_peek(reloc)); inode->i_mtime = reloc->i_mtime; iput(reloc); break;