From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4237CECAAA1 for ; Thu, 15 Sep 2022 14:29:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229738AbiIOO3c (ORCPT ); Thu, 15 Sep 2022 10:29:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229635AbiIOO3b (ORCPT ); Thu, 15 Sep 2022 10:29:31 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC2671B3; Thu, 15 Sep 2022 07:29:26 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3E5A73379A; Thu, 15 Sep 2022 14:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1663252165; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fKs2W6XuhL27XPM+JsB+PrqbYHmv4r2QbObArXgAzwI=; b=CWyfvtN1wcVC+lbZ/y/muLgFgCegfraYDBSoKXlo8IdUcKS5EVoQXW4m02sLSaFNwz3CE2 zuRGxaU8X8nd58jEmZrnwaQ6IEbXksERJtHsCDuF9HVuyVFaq1mydIzik6ToUsI+cucN2q gvjB8jTnE1FdRcETorOvACT1ciEo2/Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1663252165; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fKs2W6XuhL27XPM+JsB+PrqbYHmv4r2QbObArXgAzwI=; b=qUTGk7cTdh4F0HaECxnHbBOSxNmWxQpKPx306lAwPnam48uxkvWu9IKdl72P290wSV5sZw KPoEfAR5mn1VLTAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 315CA133B6; Thu, 15 Sep 2022 14:29:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id xrQHDMU2I2OEeQAAMHmgww (envelope-from ); Thu, 15 Sep 2022 14:29:25 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id BD407A0682; Thu, 15 Sep 2022 16:29:24 +0200 (CEST) Date: Thu, 15 Sep 2022 16:29:24 +0200 From: Jan Kara To: Ye Bin Cc: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, jack@suse.cz Subject: Re: [PATCH -next 1/2] ext4: factor out ext4_fc_disabled() Message-ID: <20220915142924.es3huwbmn5a4ofrm@quack3> References: <20220915135611.3040776-1-yebin10@huawei.com> <20220915135611.3040776-2-yebin10@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220915135611.3040776-2-yebin10@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Thu 15-09-22 21:56:10, Ye Bin wrote: > Factor out ext4_fc_disabled(). No functional change. > > Signed-off-by: Ye Bin > --- > fs/ext4/fast_commit.c | 38 +++++++++++++++----------------------- > 1 file changed, 15 insertions(+), 23 deletions(-) Nice. Feel free to add: Reviewed-by: Jan Kara Honza > > diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c > index b7414a5812f6..eadab945b856 100644 > --- a/fs/ext4/fast_commit.c > +++ b/fs/ext4/fast_commit.c > @@ -229,6 +229,12 @@ __releases(&EXT4_SB(inode->i_sb)->s_fc_lock) > finish_wait(wq, &wait.wq_entry); > } > > +static bool ext4_fc_disabled(struct super_block *sb) > +{ > + return (!test_opt2(sb, JOURNAL_FAST_COMMIT) || > + (EXT4_SB(sb)->s_mount_state & EXT4_FC_REPLAY)); > +} > + > /* > * Inform Ext4's fast about start of an inode update > * > @@ -240,8 +246,7 @@ void ext4_fc_start_update(struct inode *inode) > { > struct ext4_inode_info *ei = EXT4_I(inode); > > - if (!test_opt2(inode->i_sb, JOURNAL_FAST_COMMIT) || > - (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(inode->i_sb)) > return; > > restart: > @@ -265,8 +270,7 @@ void ext4_fc_stop_update(struct inode *inode) > { > struct ext4_inode_info *ei = EXT4_I(inode); > > - if (!test_opt2(inode->i_sb, JOURNAL_FAST_COMMIT) || > - (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(inode->i_sb)) > return; > > if (atomic_dec_and_test(&ei->i_fc_updates)) > @@ -283,8 +287,7 @@ void ext4_fc_del(struct inode *inode) > struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); > struct ext4_fc_dentry_update *fc_dentry; > > - if (!test_opt2(inode->i_sb, JOURNAL_FAST_COMMIT) || > - (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(inode->i_sb)) > return; > > restart: > @@ -337,8 +340,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl > struct ext4_sb_info *sbi = EXT4_SB(sb); > tid_t tid; > > - if (!test_opt2(sb, JOURNAL_FAST_COMMIT) || > - (EXT4_SB(sb)->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(sb)) > return; > > ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE); > @@ -493,10 +495,8 @@ void __ext4_fc_track_unlink(handle_t *handle, > void ext4_fc_track_unlink(handle_t *handle, struct dentry *dentry) > { > struct inode *inode = d_inode(dentry); > - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); > > - if (!test_opt2(inode->i_sb, JOURNAL_FAST_COMMIT) || > - (sbi->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(inode->i_sb)) > return; > > if (ext4_test_mount_flag(inode->i_sb, EXT4_MF_FC_INELIGIBLE)) > @@ -522,10 +522,8 @@ void __ext4_fc_track_link(handle_t *handle, > void ext4_fc_track_link(handle_t *handle, struct dentry *dentry) > { > struct inode *inode = d_inode(dentry); > - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); > > - if (!test_opt2(inode->i_sb, JOURNAL_FAST_COMMIT) || > - (sbi->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(inode->i_sb)) > return; > > if (ext4_test_mount_flag(inode->i_sb, EXT4_MF_FC_INELIGIBLE)) > @@ -551,10 +549,8 @@ void __ext4_fc_track_create(handle_t *handle, struct inode *inode, > void ext4_fc_track_create(handle_t *handle, struct dentry *dentry) > { > struct inode *inode = d_inode(dentry); > - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); > > - if (!test_opt2(inode->i_sb, JOURNAL_FAST_COMMIT) || > - (sbi->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(inode->i_sb)) > return; > > if (ext4_test_mount_flag(inode->i_sb, EXT4_MF_FC_INELIGIBLE)) > @@ -576,7 +572,6 @@ static int __track_inode(struct inode *inode, void *arg, bool update) > > void ext4_fc_track_inode(handle_t *handle, struct inode *inode) > { > - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); > int ret; > > if (S_ISDIR(inode->i_mode)) > @@ -588,8 +583,7 @@ void ext4_fc_track_inode(handle_t *handle, struct inode *inode) > return; > } > > - if (!test_opt2(inode->i_sb, JOURNAL_FAST_COMMIT) || > - (sbi->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(inode->i_sb)) > return; > > if (ext4_test_mount_flag(inode->i_sb, EXT4_MF_FC_INELIGIBLE)) > @@ -634,15 +628,13 @@ static int __track_range(struct inode *inode, void *arg, bool update) > void ext4_fc_track_range(handle_t *handle, struct inode *inode, ext4_lblk_t start, > ext4_lblk_t end) > { > - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); > struct __track_range_args args; > int ret; > > if (S_ISDIR(inode->i_mode)) > return; > > - if (!test_opt2(inode->i_sb, JOURNAL_FAST_COMMIT) || > - (sbi->s_mount_state & EXT4_FC_REPLAY)) > + if (ext4_fc_disabled(inode->i_sb)) > return; > > if (ext4_test_mount_flag(inode->i_sb, EXT4_MF_FC_INELIGIBLE)) > -- > 2.31.1 > -- Jan Kara SUSE Labs, CR