From patchwork Wed Jul 5 19:00:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 116359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2096345vqx; Wed, 5 Jul 2023 12:42:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlE/dfqVMNSHZxY6mVsTU/XfaMhScuEmMXq/VKJB238GTw61KWf3Kz7CPnIU1HkxzWRuqbjD X-Received: by 2002:a17:903:482:b0:1b8:a2af:fe23 with SMTP id jj2-20020a170903048200b001b8a2affe23mr4016plb.2.1688586138845; Wed, 05 Jul 2023 12:42:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688586138; cv=none; d=google.com; s=arc-20160816; b=MzZEzaaAN27ZbiQ9UqfZEQEDWQhV09BCCeecBKgFWrdJbNPo9IB+g7kSUHBtbkYYN1 CdWP+p0qsNJ1vist9dk+1XvA2QFrgek4SDX5wAvM3G2Pa2dDSahf1GITeANK/OKAoXKv dbH1ViwQaXhtD72X8dRhZ1b2EGOi0IX7Jktjah5pTiUNvz3rXwELBt1TIQgGmruEAVgH npInKEo8ePnMc/LvWiRwhqw+gwXeK/58O3j+2q1Fh8m682BIIEsHn2R5yTNfVdeRGNIv qfyzIMZ7sxs99QD89Fx5kkh+Jgno/ZnyZX0twmuzVIDmtGQN4n2VVY+QVpdHKp93Yp5Y V2SQ== 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=TcKx+FY+jz8tesuIm8uOzWPTtB+TGIfDHDDr0QllQm8=; fh=k9Md7kD5M4QOXFHSJANXllokGqExl9fTo56gUgQi7Ok=; b=lbgCf6X5ZbB5nUfYZV+PTZYPlMnxGYm310aH3MwBsNUzwmjB5JZNOfdapq9UNrW7Kn 7WvaTnD7UoQSEYzlp3pN+bttzyUgoD3+0j4NlLobyuAc8a2GAyuZoUd5+KGoDGtJPSX1 nEc+AnAleGLeKDuHR3gv2pcnZufsilpYJDBipcKGuUCiZO26aWQdDlJ4tdagtRL3LLpA MJXnpHfZ6ZNz6cbF+gopk5DsVTtcwVZQmCrD3ElZdcquii0RtMtEfK6fJivsa6xWB70h 9Oo6pIUKViaK+DlYqUh5Cl0y5a6cA68+uT5RrwdQicKTkoxIHT0Qdq/tvWr5BbUuOyso TMyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WclbXEIC; 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 k15-20020a170902c40f00b001aff514a8f0si26020673plk.534.2023.07.05.12.42.03; Wed, 05 Jul 2023 12:42:18 -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=WclbXEIC; 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 S233638AbjGETED (ORCPT + 99 others); Wed, 5 Jul 2023 15:04:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233517AbjGETDi (ORCPT ); Wed, 5 Jul 2023 15:03:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED6A31989; Wed, 5 Jul 2023 12:03:28 -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 7E553616EC; Wed, 5 Jul 2023 19:03:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5696FC433CA; Wed, 5 Jul 2023 19:03:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688583807; bh=KWaqWqc/38Kzci3VQKWkRcd53CVOEuWovP0o19vIoz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WclbXEIC0F2OWeE3/SIvdzxd4Nct3v3+p/ewdhScqQHUiwA8kX38+2hiHQfoI8Kot JYAt41YVG5MshRIFOO1EnB67og4b0wfiWgj2rllg0DAdw9AFN+7Heqf+Q6Clg5O7gJ jT+9Z4YvmD9VM12ARs/oQWuKCZf9NicyhSkkHqMW5OakqQEJXdErLml+629OSIlBOb OlxNTnkYvBfaBB7BQAHf/CoSjf5xPk4deAmP4JYnykwrRAbnf0VSz208Zury3GcS5c oezB2tGru9AuPutoCjn0dLEGkg/3Ub54Ypx2O2zFdMc7IjSyWgz0P+zx0oZio7cKdD XU17wdH9xrQUQ== From: Jeff Layton To: Christian Brauner Cc: Al Viro , Jan Kara , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, reiserfs-devel@vger.kernel.org Subject: [PATCH v2 14/92] reiserfs: convert to simple_rename_timestamp Date: Wed, 5 Jul 2023 15:00:39 -0400 Message-ID: <20230705190309.579783-12-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705190309.579783-1-jlayton@kernel.org> References: <20230705185755.579053-1-jlayton@kernel.org> <20230705190309.579783-1-jlayton@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1770610898993391120?= X-GMAIL-MSGID: =?utf-8?q?1770610898993391120?= Signed-off-by: Jeff Layton Reviewed-by: Jan Kara --- fs/reiserfs/namei.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index 52240cc891cf..405ac59eb2dd 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c @@ -1325,7 +1325,6 @@ static int reiserfs_rename(struct mnt_idmap *idmap, int jbegin_count; umode_t old_inode_mode; unsigned long savelink = 1; - struct timespec64 ctime; if (flags & ~RENAME_NOREPLACE) return -EINVAL; @@ -1576,14 +1575,11 @@ static int reiserfs_rename(struct mnt_idmap *idmap, mark_de_hidden(old_de.de_deh + old_de.de_entry_num); journal_mark_dirty(&th, old_de.de_bh); - ctime = current_time(old_dir); - old_dir->i_ctime = old_dir->i_mtime = ctime; - new_dir->i_ctime = new_dir->i_mtime = ctime; /* * thanks to Alex Adriaanse for patch * which adds ctime update of renamed object */ - old_inode->i_ctime = ctime; + simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry); if (new_dentry_inode) { /* adjust link number of the victim */ @@ -1592,7 +1588,6 @@ static int reiserfs_rename(struct mnt_idmap *idmap, } else { drop_nlink(new_dentry_inode); } - new_dentry_inode->i_ctime = ctime; savelink = new_dentry_inode->i_nlink; }