From patchwork Wed Oct 4 18:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 148490 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp340299vqb; Wed, 4 Oct 2023 11:57:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGeM52nBCGIQVbjYPWowoBLxIJIOAm4warGxo4D4UoL1HmAVA1vBVWgjlrbclUKIbzpHdYd X-Received: by 2002:a05:6a00:b95:b0:68f:dfea:9100 with SMTP id g21-20020a056a000b9500b0068fdfea9100mr4426923pfj.21.1696445822436; Wed, 04 Oct 2023 11:57:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696445822; cv=none; d=google.com; s=arc-20160816; b=dLTOEAH5Z237GKyAqASDf1XQZQuQZ4gyg5E8ZmffKjO+p8u7bzJhz7WWtF5mYENMpj ztni4MwMHsKGpSxv0BbWflSzj+DJZv3xy037/zmoht4AkKv5Pmfdblodbd7srWlM4J2e EH+G5SsV1aaFOsZcuCGmA5c6Jr+Zfnlq8fo+LbMEUFhRstTxer3QpQIBruYU9H/SqoAk jtYV5ZgUFTPF2R9YUXenNBAPdHbVhLqGFsMQ8rWYdmK/gmhvglMk09rJ+G/Xv4nIKhgP zM98uKFbU3H/ySyJMAJCC+kUNULK1YQ+NgW3zN1eRk2kC3WRFgUQhsFm1B+3UUTWlyES ABcA== 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:to:from :dkim-signature; bh=diRvL/7VCDobDS7GDFfS164nAOLj7ghUrO3lr0gBHqU=; fh=c1hve9LK7bidUltaxotdOOkNtWZ8Drk/KOyPdUWU/OI=; b=DpoFE27s8P8f1Kg7+Oe4zE7ZVOd2p4iykSwDMK2X5LuaZZkCC2L7QvAuixZaESLV7N UMvBDphWnszuRNlETYWiRtc3v7RaMexmjDf6bTgpIqX3bzu2vClBJ0sBsQCnRxuyx8GC hIK2yaKbl3bliUHoVq/2TBXcKQLZbfjhThddZl7rOI7xnIjaFkTCgm4DOwpDkT8Ni7WD dveAg0MIe4r9m6zLUWXOAKbI4erPOkIwFXD28IZwLwtrfWmNb7apz0xBCe35g1hG1XD0 t1Y4/jYUN5hKlUbVd9XUxw+VkZpObsHtNY9oAx+n4TnkOkHAxf24on1esBjam9j0oWiE M2hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QF+ZtPgJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id l65-20020a639144000000b00578acf1e8a4si4453833pge.573.2023.10.04.11.57.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 11:57:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QF+ZtPgJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 9FDA68251382; Wed, 4 Oct 2023 11:57:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244810AbjJDS47 (ORCPT + 19 others); Wed, 4 Oct 2023 14:56:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244899AbjJDSzO (ORCPT ); Wed, 4 Oct 2023 14:55:14 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A247C1AC; Wed, 4 Oct 2023 11:54:40 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6951C433C7; Wed, 4 Oct 2023 18:54:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696445680; bh=k4ZUpa6J1BuoVYWAGoQizbF/tb9dzfYDbjoaj3H865A=; h=From:To:Subject:Date:In-Reply-To:References:From; b=QF+ZtPgJltvkZ4wRlkydlrJjExkxPnb8w2VS8k2wz7RTDqIUo3j0UfEKsNWAjMFjw thFbyy6TvHMMJGOu02xNjKYxXFg+DXpGKuCTVou4Zr1OKeiwwEHg40N4Jp+/37ohon gRy7sFEP/UmyWoxws7W3m9gVQxYPpIf9f9R360tW1jLjR0RoCHmHke3E6RadBIUsWJ ogb8CCIR1Nvyb/EwlTwyTxN4a4EzP+CsC/m59vk8Bq3Kk4svptI/RhrQpNJ0sTqJ28 pq70nbhxdWY9OFp667eFyJVYtxtZWcYyayR82+gwo7IjUPZ0NNC4o8msKiMzozNwFb Bc41YRa6vHtPw== From: Jeff Layton To: Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 46/89] isofs: convert to new timestamp accessors Date: Wed, 4 Oct 2023 14:52:31 -0400 Message-ID: <20231004185347.80880-44-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004185347.80880-1-jlayton@kernel.org> References: <20231004185221.80802-1-jlayton@kernel.org> <20231004185347.80880-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 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 (snail.vger.email [0.0.0.0]); Wed, 04 Oct 2023 11:57:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778852374541367220 X-GMAIL-MSGID: 1778852374541367220 Convert to using the new inode timestamp accessor functions. Signed-off-by: Jeff Layton --- fs/isofs/inode.c | 4 ++-- fs/isofs/rock.c | 18 ++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 2ee21286ac8f..3e4d53e26f94 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -1422,8 +1422,8 @@ static int isofs_read_inode(struct inode *inode, int relocated) inode->i_ino, de->flags[-high_sierra]); } #endif - inode->i_mtime = inode->i_atime = - inode_set_ctime(inode, iso_date(de->date, high_sierra), 0); + inode_set_mtime_to_ts(inode, + inode_set_atime_to_ts(inode, inode_set_ctime(inode, iso_date(de->date, high_sierra), 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 348783a70f57..d6c17ad69dee 100644 --- a/fs/isofs/rock.c +++ b/fs/isofs/rock.c @@ -426,16 +426,14 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de, 0); } if (rr->u.TF.flags & TF_MODIFY) { - inode->i_mtime.tv_sec = - iso_date(rr->u.TF.times[cnt++].time, - 0); - inode->i_mtime.tv_nsec = 0; + inode_set_mtime(inode, + iso_date(rr->u.TF.times[cnt++].time, 0), + 0); } if (rr->u.TF.flags & TF_ACCESS) { - inode->i_atime.tv_sec = - iso_date(rr->u.TF.times[cnt++].time, - 0); - inode->i_atime.tv_nsec = 0; + inode_set_atime(inode, + iso_date(rr->u.TF.times[cnt++].time, 0), + 0); } if (rr->u.TF.flags & TF_ATTRIBUTES) { inode_set_ctime(inode, @@ -531,9 +529,9 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de, inode->i_rdev = reloc->i_rdev; inode->i_size = reloc->i_size; inode->i_blocks = reloc->i_blocks; - inode->i_atime = reloc->i_atime; + inode_set_atime_to_ts(inode, inode_get_atime(reloc)); inode_set_ctime_to_ts(inode, inode_get_ctime(reloc)); - inode->i_mtime = reloc->i_mtime; + inode_set_mtime_to_ts(inode, inode_get_mtime(reloc)); iput(reloc); break; #ifdef CONFIG_ZISOFS