[RFC PATCH] ext4: remove conflict comment from __ext4_forget

[RFC PATCH] ext4: remove conflict comment from __ext4_forget

[Guoqing Jiang]

From: Guoqing Jiang <jiangguoqing@kylinos.cn>

We do a bforget and return for no journal case, so let's remove this
conflict comment.

Signed-off-by: Guoqing Jiang <jiangguoqing@kylinos.cn>
---
Not sure if my understanding is correct, so this is RFC.

Thanks,
Guoqing

 fs/ext4/ext4_jbd2.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index be799040a415..6e224b19eae7 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -244,9 +244,6 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line,
  * "bh" may be NULL: a metadata block may have been freed from memory
  * but there may still be a record of it in the journal, and that record
  * still needs to be revoked.
- *
- * If the handle isn't valid we're not journaling, but we still need to
- * call into ext4_journal_revoke() to put the buffer head.
  */
 int __ext4_forget(const char *where, unsigned int line, handle_t *handle,
 		  int is_metadata, struct inode *inode,
-- 
2.25.1

Re: [RFC PATCH] ext4: remove conflict comment from __ext4_forget

[Jan Kara]

On Wed 23-06-21 16:58:46, Guoqing Jiang wrote:
> From: Guoqing Jiang <jiangguoqing@kylinos.cn>
> 
> We do a bforget and return for no journal case, so let's remove this
> conflict comment.
> 
> Signed-off-by: Guoqing Jiang <jiangguoqing@kylinos.cn>

Looks good. I agree the comment seems stale. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
> Not sure if my understanding is correct, so this is RFC.
> 
> Thanks,
> Guoqing
> 
>  fs/ext4/ext4_jbd2.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
> index be799040a415..6e224b19eae7 100644
> --- a/fs/ext4/ext4_jbd2.c
> +++ b/fs/ext4/ext4_jbd2.c
> @@ -244,9 +244,6 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line,
>   * "bh" may be NULL: a metadata block may have been freed from memory
>   * but there may still be a record of it in the journal, and that record
>   * still needs to be revoked.
> - *
> - * If the handle isn't valid we're not journaling, but we still need to
> - * call into ext4_journal_revoke() to put the buffer head.
>   */
>  int __ext4_forget(const char *where, unsigned int line, handle_t *handle,
>  		  int is_metadata, struct inode *inode,
> -- 
> 2.25.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

Re: [RFC PATCH] ext4: remove conflict comment from __ext4_forget

[Guoqing Jiang]

On 7/13/21 11:17 PM, Jan Kara wrote:
> On Wed 23-06-21 16:58:46, Guoqing Jiang wrote:
>> From: Guoqing Jiang <jiangguoqing@kylinos.cn>
>>
>> We do a bforget and return for no journal case, so let's remove this
>> conflict comment.
>>
>> Signed-off-by: Guoqing Jiang <jiangguoqing@kylinos.cn>
> Looks good. I agree the comment seems stale. Feel free to add:
>
> Reviewed-by: Jan Kara <jack@suse.cz>

Thanks for your review! Will send an updated one with your Reviewed-by.

BRs,
Guoqing