Re: [PATCH 4/4] jbd2: remove journal_t argument from jbd2_superblock_csum()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 2025/5/13 13:38, Eric Biggers wrote:
From: Eric Biggers <ebiggers@xxxxxxxxxx>

Since jbd2_superblock_csum() no longer uses its journal_t argument,
remove it.

Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
Looks good. Feel free to add:

Reviewed-by: Baokun Li <libaokun1@xxxxxxxxxx>
---
  fs/jbd2/journal.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 255fa03031d8..46a09744e27a 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -113,11 +113,11 @@ void __jbd2_debug(int level, const char *file, const char *func,
  	va_end(args);
  }
  #endif
/* Checksumming functions */
-static __be32 jbd2_superblock_csum(journal_t *j, journal_superblock_t *sb)
+static __be32 jbd2_superblock_csum(journal_superblock_t *sb)
  {
  	__u32 csum;
  	__be32 old_csum;
old_csum = sb->s_checksum;
@@ -1384,11 +1384,11 @@ static int journal_check_superblock(journal_t *journal)
  			printk(KERN_ERR "JBD2: Unknown checksum type\n");
  			return err;
  		}
/* Check superblock checksum */
-		if (sb->s_checksum != jbd2_superblock_csum(journal, sb)) {
+		if (sb->s_checksum != jbd2_superblock_csum(sb)) {
  			printk(KERN_ERR "JBD2: journal checksum error\n");
  			err = -EFSBADCRC;
  			return err;
  		}
  	}
@@ -1819,11 +1819,11 @@ static int jbd2_write_superblock(journal_t *journal, blk_opf_t write_flags)
  		       journal->j_devname);
  		clear_buffer_write_io_error(bh);
  		set_buffer_uptodate(bh);
  	}
  	if (jbd2_journal_has_csum_v2or3(journal))
-		sb->s_checksum = jbd2_superblock_csum(journal, sb);
+		sb->s_checksum = jbd2_superblock_csum(sb);
  	get_bh(bh);
  	bh->b_end_io = end_buffer_write_sync;
  	submit_bh(REQ_OP_WRITE | write_flags, bh);
  	wait_on_buffer(bh);
  	if (buffer_write_io_error(bh)) {






[Index of Archives]     [Reiser Filesystem Development]     [Ceph FS]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux FS]     [Yosemite National Park]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Device Mapper]     [Linux Media]

  Powered by Linux