Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a67c848a authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Theodore Ts'o
Browse files

jbd2: rename obsoleted msg JBD->JBD2 



Rename performed via: perl -pi -e 's/JBD:/JBD2:/g' fs/jbd2/*.c

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
parent 75685071

fs/jbd2/journal.c

+5 −5
Original line number Diff line number Diff line
@@ -1525,13 +1525,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;

	}
@@ -1539,7 +1539,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;
@@ -1548,7 +1548,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;

	}
@@ -1834,7 +1834,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;

fs/jbd2/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/jbd2/transaction.c

+3 −3
Original line number Diff line number Diff line
@@ -1308,7 +1308,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_ERR "JBD: %s: "

			printk(KERN_ERR "JBD2: %s: "

			       "jh->b_transaction (%llu, %p, %u) != "

			       "journal->j_running_transaction (%p, %u)",

			       journal->j_devname,
@@ -1335,7 +1335,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_ERR "JBD: %s: "

			printk(KERN_ERR "JBD2: %s: "

			       "jh->b_transaction (%llu, %p, %u) != "

			       "journal->j_committing_transaction (%p, %u)",

			       journal->j_devname,
@@ -1348,7 +1348,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) 
			ret = -EINVAL;

		}

		if (unlikely(jh->b_next_transaction != transaction)) {

			printk(KERN_ERR "JBD: %s: "

			printk(KERN_ERR "JBD2: %s: "

			       "jh->b_next_transaction (%llu, %p, %u) != "

			       "transaction (%p, %u)",

			       journal->j_devname,