Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: [PATCH v2 3/6] jbd2: remove journal_clean_one_cp_list()
To:     Jan Kara <jack@suse.cz>
Cc:     linux-ext4@vger.kernel.org, tytso@mit.edu,
        adilger.kernel@dilger.ca, yi.zhang@huawei.com, yukuai3@huawei.com,
        chengzhihao1@huawei.com
References: <20230606061447.1125036-1-yi.zhang@huaweicloud.com>
 <20230606061447.1125036-4-yi.zhang@huaweicloud.com>
 <20230606074637.6purq76gaae366t3@quack3>
From:   Zhang Yi <yi.zhang@huaweicloud.com>
Message-ID: <b96f43f9-bb00-3a6b-d428-bf122c3cd04f@huaweicloud.com>
Date:   Tue, 6 Jun 2023 21:58:33 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.12.0
MIME-Version: 1.0
In-Reply-To: <20230606074637.6purq76gaae366t3@quack3>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2023/6/6 15:46, Jan Kara wrote:
> On Tue 06-06-23 14:14:44, Zhang Yi wrote:
>> From: Zhang Yi <yi.zhang@huawei.com>
>>
>> journal_clean_one_cp_list() and journal_shrink_one_cp_list() are almost
>> the same, so merge them into journal_shrink_one_cp_list(), remove the
>> nr_to_scan parameter, always scan and try to free the whole checkpoint
>> list.
>>
>> Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
> 
> Looks good. Just one nit below:
> 
>> @@ -398,15 +358,14 @@ static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
>>   * Called with j_list_lock held.
>>   */
>>  static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
>> -						unsigned long *nr_to_scan,
>> -						bool *released)
>> +						bool destroy, bool *released)
>>  {
>>  	struct journal_head *last_jh;
>>  	struct journal_head *next_jh = jh;
>>  	unsigned long nr_freed = 0;
>>  	int ret;
> 
> When changing this function, I think it will be more robust calling
> convention to unconditionally set *released = false at the beginning of
> this function. Then we can remove the initialization from
> __jbd2_journal_clean_checkpoint_list().
> 

Thanks for the review, will change it in my next iteration.

Yi.