From patchwork Wed Oct 4 18:52:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 148519 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp341034vqb; Wed, 4 Oct 2023 11:58:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFePI5UFat9i/cPv5NoC1N/6uno9/WCLYLjjP9itQk8koLkuTYS7n2/ia5H8Y1oUguf9YhU X-Received: by 2002:a05:6358:8a2:b0:14b:86a3:b3f0 with SMTP id m34-20020a05635808a200b0014b86a3b3f0mr3366320rwj.5.1696445913953; Wed, 04 Oct 2023 11:58:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696445913; cv=none; d=google.com; s=arc-20160816; b=gIxp4aNBIlkDqssa5wM4EC5k9H1MrlQs+bxJOEmSM40hKP+0RHA+suOgkWnpIdu9cv 4HLAfbwvPFTnmH4clDoSAOZvAkTV5g86HBbwDUtqkKsJvBQdoFkxtckXTeFp4b5z5qN7 6hhjKv8kZyjZka+krqxR/D0lPzwUbpc3IppdUcK6E5EJ2N3rUGYYcN9JJDNr95a4ok1l wdzB3Xh1jZtAOjfCEey+C79b0NVio7geHMm7sRtUt27ku6yz9aK6BiSNIEF2PPCz8r5Y xla4KIMEecqcf/OIwZ7mouDiZ2mSVdqqSlQfelEZYdbj2j2y8T3JmW50Sg+f+vKzqXCh SB7w== 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=hfG5PLNOysJea65TUqCICaU6rR/RJkrGLXHlHUoj35Q=; fh=Z2bTRy1scX8IrlJyHG5XI9Cg0kzzOD+BNHzLgjwr2MI=; b=rTKdxdfWKed87Oy4MR8pjwZatyUicg/HTw37K835p5hREMUIrxXo9lKFqtgXV6whpJ GRXb2So69apMXwiG+YxRiF0XD0HHFuobhmxfxgKhgnfAzzyd8Unn9LjY31uxxC2TQFII OhEgqdBnwfEKiW6t2Oz1gHEJzQ9bdezng1igDfVKBwJbKUZqcaaVAhkSASm54gADfwCJ Xn//oD3yGzmFppGPtzbuzGoGb+tr3vfEWKI0ffPGfSI5RdhVtED4LFtIzKk1s4SH4yzt VeSBkBPRH14qGZsNz4l1U+eP+1/1DS0gpVv0iC41mbeJJsF+qv3zS8igSIff8VU4Nxdv jGtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iSutjIkT; 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id l191-20020a6388c8000000b00570505c5267si4361130pgd.262.2023.10.04.11.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 11:58:33 -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=iSutjIkT; 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 8F78780CBDC4; Wed, 4 Oct 2023 11:58:29 -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 S245131AbjJDS6L (ORCPT + 19 others); Wed, 4 Oct 2023 14:58:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244988AbjJDSzh (ORCPT ); Wed, 4 Oct 2023 14:55:37 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A43A310C0; Wed, 4 Oct 2023 11:54:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A370AC433CB; Wed, 4 Oct 2023 18:54:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696445695; bh=2GDYXuoPELo6aY4xsJQ5Xkq6BT2slz1YjAzuDRonK7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iSutjIkTw5Hg9r5T40U/3rI9n7UCPNKjw944PqszHvRshw2UhWhp/frAinofO6kwh aFedrArjmAAgJaa3BA0OffPFtHFX3093FMslVqXeptbUsis24716lHHBafC7ynkaB2 5F+FiSAgdAK7Ger1Kaa799u80Ramx+RfqMQP/v8vweUJLB4hlomh6yfLBvr0elPCBo sneCPuxSCq+tVlNSW+gN5yF8ULXpD1ldTmIEirzoqExsyobkDIo5jXE0q5KyStBtFU zX6X7Uvuif0YWr0Pwr2dJKe5OO3LUDj179M1mhOttEwySp4S1Awag15gKll/jFtkov KncqKNCf9i/6g== From: Jeff Layton To: Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-karma-devel@lists.sourceforge.net Subject: [PATCH v2 57/89] omfs: convert to new timestamp accessors Date: Wed, 4 Oct 2023 14:52:42 -0400 Message-ID: <20231004185347.80880-55-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 (howler.vger.email [0.0.0.0]); Wed, 04 Oct 2023 11:58:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778852470815382514 X-GMAIL-MSGID: 1778852470815382514 Convert to using the new inode timestamp accessor functions. Signed-off-by: Jeff Layton --- fs/omfs/inode.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c index 2f8c1882f45c..d6cd81163030 100644 --- a/fs/omfs/inode.c +++ b/fs/omfs/inode.c @@ -51,7 +51,7 @@ struct inode *omfs_new_inode(struct inode *dir, umode_t mode) inode_init_owner(&nop_mnt_idmap, inode, NULL, mode); inode->i_mapping->a_ops = &omfs_aops; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); switch (mode & S_IFMT) { case S_IFDIR: inode->i_op = &omfs_dir_inops; @@ -134,8 +134,8 @@ static int __omfs_write_inode(struct inode *inode, int wait) oi->i_head.h_magic = OMFS_IMAGIC; oi->i_size = cpu_to_be64(inode->i_size); - ctime = inode_get_ctime(inode).tv_sec * 1000LL + - ((inode_get_ctime(inode).tv_nsec + 999)/1000); + ctime = inode_get_ctime_sec(inode) * 1000LL + + ((inode_get_ctime_nsec(inode) + 999)/1000); oi->i_ctime = cpu_to_be64(ctime); omfs_update_checksums(oi); @@ -230,11 +230,9 @@ struct inode *omfs_iget(struct super_block *sb, ino_t ino) ctime = be64_to_cpu(oi->i_ctime); nsecs = do_div(ctime, 1000) * 1000L; - inode->i_atime.tv_sec = ctime; - inode->i_mtime.tv_sec = ctime; + inode_set_atime(inode, ctime, nsecs); + inode_set_mtime(inode, ctime, nsecs); inode_set_ctime(inode, ctime, nsecs); - inode->i_atime.tv_nsec = nsecs; - inode->i_mtime.tv_nsec = nsecs; inode->i_mapping->a_ops = &omfs_aops;