Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit a67c848a8b9aa9e471f9eaadd2cb29cc527462cf

Authored by Dmitry Monakhov
Committed by Theodore Ts'o
1 parent 75685071cd
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 3 changed files with 9 additions and 9 deletions Side-by-side Diff

... ... @@ -1525,13 +1525,13 @@
1525 1525 if (JBD2_HAS_COMPAT_FEATURE(journal, JBD2_FEATURE_COMPAT_CHECKSUM) &&
1526 1526 JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
1527 1527 /* Can't have checksum v1 and v2 on at the same time! */
1528   - printk(KERN_ERR "JBD: Can't enable checksumming v1 and v2 "
  1528 + printk(KERN_ERR "JBD2: Can't enable checksumming v1 and v2 "
1529 1529 "at the same time!\n");
1530 1530 goto out;
1531 1531 }
1532 1532  
1533 1533 if (!jbd2_verify_csum_type(journal, sb)) {
1534   - printk(KERN_ERR "JBD: Unknown checksum type\n");
  1534 + printk(KERN_ERR "JBD2: Unknown checksum type\n");
1535 1535 goto out;
1536 1536 }
1537 1537  
... ... @@ -1539,7 +1539,7 @@
1539 1539 if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_CSUM_V2)) {
1540 1540 journal->j_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);
1541 1541 if (IS_ERR(journal->j_chksum_driver)) {
1542   - printk(KERN_ERR "JBD: Cannot load crc32c driver.\n");
  1542 + printk(KERN_ERR "JBD2: Cannot load crc32c driver.\n");
1543 1543 err = PTR_ERR(journal->j_chksum_driver);
1544 1544 journal->j_chksum_driver = NULL;
1545 1545 goto out;
... ... @@ -1548,7 +1548,7 @@
1548 1548  
1549 1549 /* Check superblock checksum */
1550 1550 if (!jbd2_superblock_csum_verify(journal, sb)) {
1551   - printk(KERN_ERR "JBD: journal checksum error\n");
  1551 + printk(KERN_ERR "JBD2: journal checksum error\n");
1552 1552 goto out;
1553 1553 }
1554 1554  
... ... @@ -1834,7 +1834,7 @@
1834 1834 journal->j_chksum_driver = crypto_alloc_shash("crc32c",
1835 1835 0, 0);
1836 1836 if (IS_ERR(journal->j_chksum_driver)) {
1837   - printk(KERN_ERR "JBD: Cannot load crc32c "
  1837 + printk(KERN_ERR "JBD2: Cannot load crc32c "
1838 1838 "driver.\n");
1839 1839 journal->j_chksum_driver = NULL;
1840 1840 return 0;
... ... @@ -594,7 +594,7 @@
594 594 be32_to_cpu(tmp->h_sequence))) {
595 595 brelse(obh);
596 596 success = -EIO;
597   - printk(KERN_ERR "JBD: Invalid "
  597 + printk(KERN_ERR "JBD2: Invalid "
598 598 "checksum recovering "
599 599 "block %llu in log\n",
600 600 blocknr);
fs/jbd2/transaction.c
Diff comments   View file @ a67c848
... ... @@ -1308,7 +1308,7 @@
1308 1308 JBUFFER_TRACE(jh, "fastpath");
1309 1309 if (unlikely(jh->b_transaction !=
1310 1310 journal->j_running_transaction)) {
1311   - printk(KERN_ERR "JBD: %s: "
  1311 + printk(KERN_ERR "JBD2: %s: "
1312 1312 "jh->b_transaction (%llu, %p, %u) != "
1313 1313 "journal->j_running_transaction (%p, %u)",
1314 1314 journal->j_devname,
... ... @@ -1335,7 +1335,7 @@
1335 1335 JBUFFER_TRACE(jh, "already on other transaction");
1336 1336 if (unlikely(jh->b_transaction !=
1337 1337 journal->j_committing_transaction)) {
1338   - printk(KERN_ERR "JBD: %s: "
  1338 + printk(KERN_ERR "JBD2: %s: "
1339 1339 "jh->b_transaction (%llu, %p, %u) != "
1340 1340 "journal->j_committing_transaction (%p, %u)",
1341 1341 journal->j_devname,
... ... @@ -1348,7 +1348,7 @@
1348 1348 ret = -EINVAL;
1349 1349 }
1350 1350 if (unlikely(jh->b_next_transaction != transaction)) {
1351   - printk(KERN_ERR "JBD: %s: "
  1351 + printk(KERN_ERR "JBD2: %s: "
1352 1352 "jh->b_next_transaction (%llu, %p, %u) != "
1353 1353 "transaction (%p, %u)",
1354 1354 journal->j_devname,