Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btrfs: remove stale newlines from log messages

I've noticed an extra line after "use no compression", but search
revealed much more in messages of more critical levels and rare errors.

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>

authored by

David Sterba and committed by
Chris Mason
351fd353 7d788742

+14 -14
+1 -1
fs/btrfs/extent-tree.c
··· 5932 5932 refs = btrfs_extent_refs(leaf, ei); 5933 5933 if (refs < refs_to_drop) { 5934 5934 btrfs_err(info, "trying to drop %d refs but we only have %Lu " 5935 - "for bytenr %Lu\n", refs_to_drop, refs, bytenr); 5935 + "for bytenr %Lu", refs_to_drop, refs, bytenr); 5936 5936 ret = -EINVAL; 5937 5937 btrfs_abort_transaction(trans, extent_root, ret); 5938 5938 goto out;
+2 -2
fs/btrfs/inode.c
··· 3475 3475 ret = btrfs_load_inode_props(inode, path); 3476 3476 if (ret) 3477 3477 btrfs_err(root->fs_info, 3478 - "error loading props for ino %llu (root %llu): %d\n", 3478 + "error loading props for ino %llu (root %llu): %d", 3479 3479 btrfs_ino(inode), 3480 3480 root->root_key.objectid, ret); 3481 3481 } ··· 8010 8010 err = btrfs_subvol_inherit_props(trans, new_root, parent_root); 8011 8011 if (err) 8012 8012 btrfs_err(new_root->fs_info, 8013 - "error inheriting subvolume %llu properties: %d\n", 8013 + "error inheriting subvolume %llu properties: %d", 8014 8014 new_root->root_key.objectid, err); 8015 8015 8016 8016 err = btrfs_update_inode(trans, new_root, inode);
+1 -1
fs/btrfs/ordered-data.c
··· 67 67 { 68 68 struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); 69 69 btrfs_panic(fs_info, errno, "Inconsistency in ordered tree at offset " 70 - "%llu\n", offset); 70 + "%llu", offset); 71 71 } 72 72 73 73 /*
+2 -2
fs/btrfs/relocation.c
··· 337 337 if (bnode->root) 338 338 fs_info = bnode->root->fs_info; 339 339 btrfs_panic(fs_info, errno, "Inconsistency in backref cache " 340 - "found at offset %llu\n", bytenr); 340 + "found at offset %llu", bytenr); 341 341 } 342 342 343 343 /* ··· 1259 1259 if (rb_node) { 1260 1260 btrfs_panic(root->fs_info, -EEXIST, "Duplicate root found " 1261 1261 "for start=%llu while inserting into relocation " 1262 - "tree\n", node->bytenr); 1262 + "tree", node->bytenr); 1263 1263 kfree(node); 1264 1264 return -EEXIST; 1265 1265 }
+2 -2
fs/btrfs/send.c
··· 1349 1349 ret = -EIO; 1350 1350 btrfs_err(sctx->send_root->fs_info, "did not find backref in " 1351 1351 "send_root. inode=%llu, offset=%llu, " 1352 - "disk_byte=%llu found extent=%llu\n", 1352 + "disk_byte=%llu found extent=%llu", 1353 1353 ino, data_offset, disk_byte, found_key.objectid); 1354 1354 goto out; 1355 1355 } ··· 5472 5472 */ 5473 5473 if (root->send_in_progress < 0) 5474 5474 btrfs_err(root->fs_info, 5475 - "send_in_progres unbalanced %d root %llu\n", 5475 + "send_in_progres unbalanced %d root %llu", 5476 5476 root->send_in_progress, root->root_key.objectid); 5477 5477 spin_unlock(&root->root_item_lock); 5478 5478 }
+1 -1
fs/btrfs/super.c
··· 511 511 } else if (compress) { 512 512 if (!btrfs_test_opt(root, COMPRESS)) 513 513 btrfs_info(root->fs_info, 514 - "btrfs: use %s compression\n", 514 + "btrfs: use %s compression", 515 515 compress_type); 516 516 } 517 517 break;
+5 -5
fs/btrfs/volumes.c
··· 4133 4133 if (!devs_max) 4134 4134 devs_max = BTRFS_MAX_DEVS_SYS_CHUNK; 4135 4135 } else { 4136 - btrfs_err(info, "invalid chunk type 0x%llx requested\n", 4136 + btrfs_err(info, "invalid chunk type 0x%llx requested", 4137 4137 type); 4138 4138 BUG_ON(1); 4139 4139 } ··· 4381 4381 4382 4382 if (em->start != chunk_offset || em->len != chunk_size) { 4383 4383 btrfs_crit(extent_root->fs_info, "found a bad mapping, wanted" 4384 - " %Lu-%Lu, found %Lu-%Lu\n", chunk_offset, 4384 + " %Lu-%Lu, found %Lu-%Lu", chunk_offset, 4385 4385 chunk_size, em->start, em->len); 4386 4386 free_extent_map(em); 4387 4387 return -EINVAL; ··· 4583 4583 * and exit, so return 1 so the callers don't try to use other copies. 4584 4584 */ 4585 4585 if (!em) { 4586 - btrfs_crit(fs_info, "No mapping for %Lu-%Lu\n", logical, 4586 + btrfs_crit(fs_info, "No mapping for %Lu-%Lu", logical, 4587 4587 logical+len); 4588 4588 return 1; 4589 4589 } 4590 4590 4591 4591 if (em->start > logical || em->start + em->len < logical) { 4592 4592 btrfs_crit(fs_info, "Invalid mapping for %Lu-%Lu, got " 4593 - "%Lu-%Lu\n", logical, logical+len, em->start, 4593 + "%Lu-%Lu", logical, logical+len, em->start, 4594 4594 em->start + em->len); 4595 4595 free_extent_map(em); 4596 4596 return 1; ··· 4771 4771 4772 4772 if (em->start > logical || em->start + em->len < logical) { 4773 4773 btrfs_crit(fs_info, "found a bad mapping, wanted %Lu, " 4774 - "found %Lu-%Lu\n", logical, em->start, 4774 + "found %Lu-%Lu", logical, em->start, 4775 4775 em->start + em->len); 4776 4776 free_extent_map(em); 4777 4777 return -EINVAL;