Skip to contentSkip to conversation

ext4: remove conflict comment from __ext4_forget

PATCH Applied Guoqing Jiang 2 participants 2 messages Jul 14, 2021 – Jul 23, 2021 ext4 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext4: remove conflict comment from __ext4_forget

From: Guoqing Jiang <[email protected]>

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

---
Change from RFC: add Jan's Reviewed-by.

 fs/ext4/ext4_jbd2.c | 3 ---
 1 file changed, 3 deletions(-)
fs/ext4/ext4_jbd2.c +0 -3
index be799040a415..6e224b19eae7 100644
@@ -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,
Signature · 1 line
2.25.1