From patchwork Tue Nov 9 02:34:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12609531 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91F98C433F5 for ; Tue, 9 Nov 2021 02:34:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4DADD61208 for ; Tue, 9 Nov 2021 02:34:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4DADD61208 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id E82226B00E1; Mon, 8 Nov 2021 21:34:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E0D1A6B00E3; Mon, 8 Nov 2021 21:34:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CAA0C6B00E4; Mon, 8 Nov 2021 21:34:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0091.hostedemail.com [216.40.44.91]) by kanga.kvack.org (Postfix) with ESMTP id AEF116B00E1 for ; Mon, 8 Nov 2021 21:34:44 -0500 (EST) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 78185180E1CFD for ; Tue, 9 Nov 2021 02:34:44 +0000 (UTC) X-FDA: 78787823730.01.7B6FE8D Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf25.hostedemail.com (Postfix) with ESMTP id 23348B000188 for ; Tue, 9 Nov 2021 02:34:33 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 2A3A561242; Tue, 9 Nov 2021 02:34:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1636425283; bh=zMJcG0nuHewLpQ75CcsO1skQByWm603LY1upCCbzezA=; h=Date:From:To:Subject:In-Reply-To:From; b=v4cmjmOO/sG1AXllp44CjkyzGX0wJyG7VHqPPeERl/QM6Zg1Gq+inH3I7HUF2oA+2 HdJQ/h/pgFvEkT2A3MXgiWzYxFKAKKo9LtOuG+TeqviovVpwviUpOZTYa0g6WHSs9P M/ikEODsRoQ9KLIo72gbv6Vn9B7ggSufKpJAWPf8= Date: Mon, 08 Nov 2021 18:34:42 -0800 From: Andrew Morton To: akpm@linux-foundation.org, alex.shi@linux.alibaba.com, jaharkes@cs.cmu.edu, jing.yangyang@zte.com.cn, linux-mm@kvack.org, mm-commits@vger.kernel.org, tanxin.ctf@gmail.com, torvalds@linux-foundation.org, xiyuyang19@fudan.edu.cn, zealci@zte.com.cn Subject: [patch 61/87] coda: avoid hidden code duplication in rename Message-ID: <20211109023442.IbI4EeksA%akpm@linux-foundation.org> In-Reply-To: <20211108183057.809e428e841088b657a975ec@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 23348B000188 X-Stat-Signature: bwi71e3mj8gx8w6kcxrp1xzqnzwydzx8 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=v4cmjmOO; spf=pass (imf25.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-HE-Tag: 1636425273-498946 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Jan Harkes Subject: coda: avoid hidden code duplication in rename We were actually fixing up the directory mtime in both branches after the negative dentry test, it was just that one branch was only flagging the directory inodes to refresh their attributes while the other branch used the optional optimization to set mtime to the current time and not go back to the Coda client. Link: https://lkml.kernel.org/r/20210908140308.18491-6-jaharkes@cs.cmu.edu Signed-off-by: Jan Harkes Cc: Alex Shi Cc: Jing Yangyang Cc: Xin Tan Cc: Xiyu Yang Cc: Zeal Robot Signed-off-by: Andrew Morton --- fs/coda/dir.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) --- a/fs/coda/dir.c~coda-avoid-hidden-code-duplication-in-rename +++ a/fs/coda/dir.c @@ -317,13 +317,10 @@ static int coda_rename(struct user_names coda_dir_drop_nlink(old_dir); coda_dir_inc_nlink(new_dir); } - coda_dir_update_mtime(old_dir); - coda_dir_update_mtime(new_dir); coda_flag_inode(d_inode(new_dentry), C_VATTR); - } else { - coda_flag_inode(old_dir, C_VATTR); - coda_flag_inode(new_dir, C_VATTR); } + coda_dir_update_mtime(old_dir); + coda_dir_update_mtime(new_dir); } return error; }