linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guoqing Jiang <jgq516@gmail.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca
Cc: linux-ext4@vger.kernel.org
Subject: [RFC PATCH] ext4: remove conflict comment from __ext4_forget
Date: Wed, 23 Jun 2021 16:58:46 +0800	[thread overview]
Message-ID: <20210623085846.1059647-1-jgq516@gmail.com> (raw)

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


             reply	other threads:[~2021-06-23  8:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-23  8:58 Guoqing Jiang [this message]
2021-07-13 15:17 ` [RFC PATCH] ext4: remove conflict comment from __ext4_forget Jan Kara
2021-07-14  5:52   ` Guoqing Jiang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210623085846.1059647-1-jgq516@gmail.com \
    --to=jgq516@gmail.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).