[PATCH] jbd2: prefix printks with JBD2: not JBD:

linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH] jbd2: prefix printks with JBD2: not JBD:
@ 2014-05-07 16:54 Eric Sandeen
  2014-05-12  0:17 ` Theodore Ts'o
  2014-05-26 15:28 ` Carlos Maiolino
  0 siblings, 2 replies; 5+ messages in thread
From: Eric Sandeen @ 2014-05-07 16:54 UTC (permalink / raw)
  To: ext4 development

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@redhat.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,


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] jbd2: prefix printks with JBD2: not JBD:
  2014-05-07 16:54 [PATCH] jbd2: prefix printks with JBD2: not JBD: Eric Sandeen
@ 2014-05-12  0:17 ` Theodore Ts'o
  2014-05-12 14:28   ` Eric Sandeen
  2014-05-26 15:28 ` Carlos Maiolino
  1 sibling, 1 reply; 5+ messages in thread
From: Theodore Ts'o @ 2014-05-12  0:17 UTC (permalink / raw)
  To: Eric Sandeen; +Cc: ext4 development

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@redhat.com>

What kernel version is this against?  This has been fixed since 3.13:

commit a67c848a8b9aa9e471f9eaadd2cb29cc527462cf
Author: Dmitry Monakhov <dmonakhov@openvz.org>
Date:   Sun Dec 8 21:14:59 2013 -0500

    jbd2: rename obsoleted msg JBD->JBD2
    
    Rename performed via: perl -pi -e 's/JBD:/JBD2:/g' fs/jbd2/*.c
    
    Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

					- Ted

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] jbd2: prefix printks with JBD2: not JBD:
  2014-05-12  0:17 ` Theodore Ts'o
@ 2014-05-12 14:28   ` Eric Sandeen
  0 siblings, 0 replies; 5+ messages in thread
From: Eric Sandeen @ 2014-05-12 14:28 UTC (permalink / raw)
  To: Theodore Ts'o; +Cc: ext4 development

On 5/11/14, 7:17 PM, Theodore Ts'o wrote:
> What kernel version is this against?  This has been fixed since 3.13:

Oh, I'm sorry.  It was against "upstream" but on a box where I had
inexplicably not done a git pull for a long while, an just assumed
I was up to date.  :(  Sorry for the noise.

-Eric

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] jbd2: prefix printks with JBD2: not JBD:
  2014-05-07 16:54 [PATCH] jbd2: prefix printks with JBD2: not JBD: Eric Sandeen
  2014-05-12  0:17 ` Theodore Ts'o
@ 2014-05-26 15:28 ` Carlos Maiolino
  2014-05-26 15:53   ` Theodore Ts'o
  1 sibling, 1 reply; 5+ messages in thread
From: Carlos Maiolino @ 2014-05-26 15:28 UTC (permalink / raw)
  To: Eric Sandeen; +Cc: ext4 development

I really thought we had already fixed it.

The patch looks good too, consider it

Reviewed-by: Carlos Maiolino <cmaiolino@redhat.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@redhat.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@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Carlos

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] jbd2: prefix printks with JBD2: not JBD:
  2014-05-26 15:28 ` Carlos Maiolino
@ 2014-05-26 15:53   ` Theodore Ts'o
  0 siblings, 0 replies; 5+ messages in thread
From: Theodore Ts'o @ 2014-05-26 15:53 UTC (permalink / raw)
  To: Eric Sandeen, ext4 development

On Mon, May 26, 2014 at 12:28:46PM -0300, Carlos Maiolino wrote:
> I really thought we had already fixed it.
> 
> The patch looks good too, consider it
> 
> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

We have fixed this already, and I had noted this already.  See commit
a67c848a8

					- Ted

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-05-26 15:53 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-07 16:54 [PATCH] jbd2: prefix printks with JBD2: not JBD: Eric Sandeen
2014-05-12  0:17 ` Theodore Ts'o
2014-05-12 14:28   ` Eric Sandeen
2014-05-26 15:28 ` Carlos Maiolino
2014-05-26 15:53   ` Theodore Ts'o

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).