Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
fs/jbd2/journal.c
View file @ a67c848a
...@@ -1525,13 +1525,13 @@ static int journal_get_superblock(journal_t *journal) ...@@ -1525,13 +1525,13 @@ static int journal_get_superblock(journal_t *journal)
if (JBD2_HAS_COMPAT_FEATURE(journal, JBD2_FEATURE_COMPAT_CHECKSUM) && if (JBD2_HAS_COMPAT_FEATURE(journal, JBD2_FEATURE_COMPAT_CHECKSUM) &&
JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) { JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
/* Can't have checksum v1 and v2 on at the same time! */ /* 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"); "at the same time!\n");
goto out; goto out;
} }
if (!jbd2_verify_csum_type(journal, sb)) { 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; goto out;
} }
...@@ -1539,7 +1539,7 @@ static int journal_get_superblock(journal_t *journal) ...@@ -1539,7 +1539,7 @@ static int journal_get_superblock(journal_t *journal)
if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) { if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
journal->j_chksum_driver = crypto_alloc_shash("crc32c", 0, 0); journal->j_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);
if (IS_ERR(journal->j_chksum_driver)) { 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); err = PTR_ERR(journal->j_chksum_driver);
journal->j_chksum_driver = NULL; journal->j_chksum_driver = NULL;
goto out; goto out;
...@@ -1548,7 +1548,7 @@ static int journal_get_superblock(journal_t *journal) ...@@ -1548,7 +1548,7 @@ static int journal_get_superblock(journal_t *journal)
/* Check superblock checksum */ /* Check superblock checksum */
if (!jbd2_superblock_csum_verify(journal, sb)) { 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; goto out;
} }
...@@ -1834,7 +1834,7 @@ int jbd2_journal_set_features (journal_t *journal, unsigned long compat, ...@@ -1834,7 +1834,7 @@ int jbd2_journal_set_features (journal_t *journal, unsigned long compat,
journal->j_chksum_driver = crypto_alloc_shash("crc32c", journal->j_chksum_driver = crypto_alloc_shash("crc32c",
0, 0); 0, 0);
if (IS_ERR(journal->j_chksum_driver)) { if (IS_ERR(journal->j_chksum_driver)) {
printk(KERN_ERR "JBD: Cannot load crc32c " printk(KERN_ERR "JBD2: Cannot load crc32c "
"driver.\n"); "driver.\n");
journal->j_chksum_driver = NULL; journal->j_chksum_driver = NULL;
return 0; return 0;
......
fs/jbd2/recovery.c
View file @ a67c848a
...@@ -594,7 +594,7 @@ static int do_one_pass(journal_t *journal, ...@@ -594,7 +594,7 @@ static int do_one_pass(journal_t *journal,
be32_to_cpu(tmp->h_sequence))) { be32_to_cpu(tmp->h_sequence))) {
brelse(obh); brelse(obh);
success = -EIO; success = -EIO;
printk(KERN_ERR "JBD: Invalid " printk(KERN_ERR "JBD2: Invalid "
"checksum recovering " "checksum recovering "
"block %llu in log\n", "block %llu in log\n",
blocknr); blocknr);
......
fs/jbd2/transaction.c
View file @ a67c848a
...@@ -1308,7 +1308,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1308,7 +1308,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
JBUFFER_TRACE(jh, "fastpath"); JBUFFER_TRACE(jh, "fastpath");
if (unlikely(jh->b_transaction != if (unlikely(jh->b_transaction !=
journal->j_running_transaction)) { journal->j_running_transaction)) {
printk(KERN_ERR "JBD: %s: " printk(KERN_ERR "JBD2: %s: "
"jh->b_transaction (%llu, %p, %u) != " "jh->b_transaction (%llu, %p, %u) != "
"journal->j_running_transaction (%p, %u)", "journal->j_running_transaction (%p, %u)",
journal->j_devname, journal->j_devname,
...@@ -1335,7 +1335,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1335,7 +1335,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
JBUFFER_TRACE(jh, "already on other transaction"); JBUFFER_TRACE(jh, "already on other transaction");
if (unlikely(jh->b_transaction != if (unlikely(jh->b_transaction !=
journal->j_committing_transaction)) { journal->j_committing_transaction)) {
printk(KERN_ERR "JBD: %s: " printk(KERN_ERR "JBD2: %s: "
"jh->b_transaction (%llu, %p, %u) != " "jh->b_transaction (%llu, %p, %u) != "
"journal->j_committing_transaction (%p, %u)", "journal->j_committing_transaction (%p, %u)",
journal->j_devname, journal->j_devname,
...@@ -1348,7 +1348,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1348,7 +1348,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
ret = -EINVAL; ret = -EINVAL;
} }
if (unlikely(jh->b_next_transaction != transaction)) { if (unlikely(jh->b_next_transaction != transaction)) {
printk(KERN_ERR "JBD: %s: " printk(KERN_ERR "JBD2: %s: "
"jh->b_next_transaction (%llu, %p, %u) != " "jh->b_next_transaction (%llu, %p, %u) != "
"transaction (%p, %u)", "transaction (%p, %u)",
journal->j_devname, journal->j_devname,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7