linux-ext4 - Re: [PATCH] jbd2: prefix printks with JBD2: not JBD:

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Mon, 26 May 2014 12:28:46 -0300
From:	Carlos Maiolino <cmaiolino@...hat.com>
To:	Eric Sandeen <sandeen@...hat.com>
Cc:	ext4 development <linux-ext4@...r.kernel.org>
Subject: Re: [PATCH] jbd2: prefix printks with JBD2: not JBD:

I really thought we had already fixed it.

The patch looks good too, consider it

Reviewed-by: Carlos Maiolino <cmaiolino@...hat.com>

Cheers o/

On Wed, May 07, 2014 at 11:54:04AM -0500, Eric Sandeen wrote:
> I was looking at some debugging logs from a test on ext4,
> and wondered why I saw messages from JBD: not JBD2:
> 
> This is why!  Probably worth changing for consistency.
> 
> Signed-off-by: Eric Sandeen <sandeen@...hat.com>
> ---
> 
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index 5203264..de35b53 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -1527,13 +1527,13 @@ static int journal_get_superblock(journal_t *journal)
>  	if (JBD2_HAS_COMPAT_FEATURE(journal, JBD2_FEATURE_COMPAT_CHECKSUM) &&
>  	    JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
>  		/* Can't have checksum v1 and v2 on at the same time! */
> -		printk(KERN_ERR "JBD: Can't enable checksumming v1 and v2 "
> +		printk(KERN_ERR "JBD2: Can't enable checksumming v1 and v2 "
>  		       "at the same time!\n");
>  		goto out;
>  	}
>  
>  	if (!jbd2_verify_csum_type(journal, sb)) {
> -		printk(KERN_ERR "JBD: Unknown checksum type\n");
> +		printk(KERN_ERR "JBD2: Unknown checksum type\n");
>  		goto out;
>  	}
>  
> @@ -1541,7 +1541,7 @@ static int journal_get_superblock(journal_t *journal)
>  	if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
>  		journal->j_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);
>  		if (IS_ERR(journal->j_chksum_driver)) {
> -			printk(KERN_ERR "JBD: Cannot load crc32c driver.\n");
> +			printk(KERN_ERR "JBD2: Cannot load crc32c driver.\n");
>  			err = PTR_ERR(journal->j_chksum_driver);
>  			journal->j_chksum_driver = NULL;
>  			goto out;
> @@ -1550,7 +1550,7 @@ static int journal_get_superblock(journal_t *journal)
>  
>  	/* Check superblock checksum */
>  	if (!jbd2_superblock_csum_verify(journal, sb)) {
> -		printk(KERN_ERR "JBD: journal checksum error\n");
> +		printk(KERN_ERR "JBD2: journal checksum error\n");
>  		goto out;
>  	}
>  
> @@ -1836,7 +1836,7 @@ int jbd2_journal_set_features (journal_t *journal, unsigned long compat,
>  			journal->j_chksum_driver = crypto_alloc_shash("crc32c",
>  								      0, 0);
>  			if (IS_ERR(journal->j_chksum_driver)) {
> -				printk(KERN_ERR "JBD: Cannot load crc32c "
> +				printk(KERN_ERR "JBD2: Cannot load crc32c "
>  				       "driver.\n");
>  				journal->j_chksum_driver = NULL;
>  				return 0;
> diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
> index 3929c50..3b6bb19 100644
> --- a/fs/jbd2/recovery.c
> +++ b/fs/jbd2/recovery.c
> @@ -594,7 +594,7 @@ static int do_one_pass(journal_t *journal,
>  						be32_to_cpu(tmp->h_sequence))) {
>  						brelse(obh);
>  						success = -EIO;
> -						printk(KERN_ERR "JBD: Invalid "
> +						printk(KERN_ERR "JBD2: Invalid "
>  						       "checksum recovering "
>  						       "block %llu in log\n",
>  						       blocknr);
> diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
> index 7aa9a32..68ebfe1 100644
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@ -1305,7 +1305,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
>  		JBUFFER_TRACE(jh, "fastpath");
>  		if (unlikely(jh->b_transaction !=
>  			     journal->j_running_transaction)) {
> -			printk(KERN_EMERG "JBD: %s: "
> +			printk(KERN_EMERG "JBD2: %s: "
>  			       "jh->b_transaction (%llu, %p, %u) != "
>  			       "journal->j_running_transaction (%p, %u)",
>  			       journal->j_devname,
> @@ -1332,7 +1332,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
>  		JBUFFER_TRACE(jh, "already on other transaction");
>  		if (unlikely(jh->b_transaction !=
>  			     journal->j_committing_transaction)) {
> -			printk(KERN_EMERG "JBD: %s: "
> +			printk(KERN_EMERG "JBD2: %s: "
>  			       "jh->b_transaction (%llu, %p, %u) != "
>  			       "journal->j_committing_transaction (%p, %u)",
>  			       journal->j_devname,
> @@ -1345,7 +1345,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
>  			ret = -EINVAL;
>  		}
>  		if (unlikely(jh->b_next_transaction != transaction)) {
> -			printk(KERN_EMERG "JBD: %s: "
> +			printk(KERN_EMERG "JBD2: %s: "
>  			       "jh->b_next_transaction (%llu, %p, %u) != "
>  			       "transaction (%p, %u)",
>  			       journal->j_devname,
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Carlos
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html