diff options
-rw-r--r-- | fs/btrfs/extent-tree.c | 2 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 4 | ||||
-rw-r--r-- | fs/btrfs/ordered-data.c | 2 | ||||
-rw-r--r-- | fs/btrfs/relocation.c | 4 | ||||
-rw-r--r-- | fs/btrfs/send.c | 4 | ||||
-rw-r--r-- | fs/btrfs/super.c | 2 | ||||
-rw-r--r-- | fs/btrfs/volumes.c | 10 |
7 files changed, 14 insertions, 14 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index ddf16bfb9270..bb5b3067ddc3 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -5932,7 +5932,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, | |||
5932 | refs = btrfs_extent_refs(leaf, ei); | 5932 | refs = btrfs_extent_refs(leaf, ei); |
5933 | if (refs < refs_to_drop) { | 5933 | if (refs < refs_to_drop) { |
5934 | btrfs_err(info, "trying to drop %d refs but we only have %Lu " | 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 | ret = -EINVAL; | 5936 | ret = -EINVAL; |
5937 | btrfs_abort_transaction(trans, extent_root, ret); | 5937 | btrfs_abort_transaction(trans, extent_root, ret); |
5938 | goto out; | 5938 | goto out; |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 95ac6b4f2390..0b8ce3002cfe 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -3475,7 +3475,7 @@ cache_acl: | |||
3475 | ret = btrfs_load_inode_props(inode, path); | 3475 | ret = btrfs_load_inode_props(inode, path); |
3476 | if (ret) | 3476 | if (ret) |
3477 | btrfs_err(root->fs_info, | 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 | btrfs_ino(inode), | 3479 | btrfs_ino(inode), |
3480 | root->root_key.objectid, ret); | 3480 | root->root_key.objectid, ret); |
3481 | } | 3481 | } |
@@ -8010,7 +8010,7 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, | |||
8010 | err = btrfs_subvol_inherit_props(trans, new_root, parent_root); | 8010 | err = btrfs_subvol_inherit_props(trans, new_root, parent_root); |
8011 | if (err) | 8011 | if (err) |
8012 | btrfs_err(new_root->fs_info, | 8012 | btrfs_err(new_root->fs_info, |
8013 | "error inheriting subvolume %llu properties: %d\n", | 8013 | "error inheriting subvolume %llu properties: %d", |
8014 | new_root->root_key.objectid, err); | 8014 | new_root->root_key.objectid, err); |
8015 | 8015 | ||
8016 | err = btrfs_update_inode(trans, new_root, inode); | 8016 | err = btrfs_update_inode(trans, new_root, inode); |
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index a94b05f72869..e12441c7cf1d 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c | |||
@@ -67,7 +67,7 @@ static void ordered_data_tree_panic(struct inode *inode, int errno, | |||
67 | { | 67 | { |
68 | struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); | 68 | struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); |
69 | btrfs_panic(fs_info, errno, "Inconsistency in ordered tree at offset " | 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 | /* |
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index b9cf0f522513..65245a07275b 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -337,7 +337,7 @@ static void backref_tree_panic(struct rb_node *rb_node, int errno, u64 bytenr) | |||
337 | if (bnode->root) | 337 | if (bnode->root) |
338 | fs_info = bnode->root->fs_info; | 338 | fs_info = bnode->root->fs_info; |
339 | btrfs_panic(fs_info, errno, "Inconsistency in backref cache " | 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,7 +1259,7 @@ static int __must_check __add_reloc_root(struct btrfs_root *root) | |||
1259 | if (rb_node) { | 1259 | if (rb_node) { |
1260 | btrfs_panic(root->fs_info, -EEXIST, "Duplicate root found " | 1260 | btrfs_panic(root->fs_info, -EEXIST, "Duplicate root found " |
1261 | "for start=%llu while inserting into relocation " | 1261 | "for start=%llu while inserting into relocation " |
1262 | "tree\n", node->bytenr); | 1262 | "tree", node->bytenr); |
1263 | kfree(node); | 1263 | kfree(node); |
1264 | return -EEXIST; | 1264 | return -EEXIST; |
1265 | } | 1265 | } |
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 3f14b31c0c96..a86c049932f9 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c | |||
@@ -1349,7 +1349,7 @@ static int find_extent_clone(struct send_ctx *sctx, | |||
1349 | ret = -EIO; | 1349 | ret = -EIO; |
1350 | btrfs_err(sctx->send_root->fs_info, "did not find backref in " | 1350 | btrfs_err(sctx->send_root->fs_info, "did not find backref in " |
1351 | "send_root. inode=%llu, offset=%llu, " | 1351 | "send_root. inode=%llu, offset=%llu, " |
1352 | "disk_byte=%llu found extent=%llu\n", | 1352 | "disk_byte=%llu found extent=%llu", |
1353 | ino, data_offset, disk_byte, found_key.objectid); | 1353 | ino, data_offset, disk_byte, found_key.objectid); |
1354 | goto out; | 1354 | goto out; |
1355 | } | 1355 | } |
@@ -5472,7 +5472,7 @@ static void btrfs_root_dec_send_in_progress(struct btrfs_root* root) | |||
5472 | */ | 5472 | */ |
5473 | if (root->send_in_progress < 0) | 5473 | if (root->send_in_progress < 0) |
5474 | btrfs_err(root->fs_info, | 5474 | btrfs_err(root->fs_info, |
5475 | "send_in_progres unbalanced %d root %llu\n", | 5475 | "send_in_progres unbalanced %d root %llu", |
5476 | root->send_in_progress, root->root_key.objectid); | 5476 | root->send_in_progress, root->root_key.objectid); |
5477 | spin_unlock(&root->root_item_lock); | 5477 | spin_unlock(&root->root_item_lock); |
5478 | } | 5478 | } |
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 77fcb5706700..4662d92a4b73 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -511,7 +511,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
511 | } else if (compress) { | 511 | } else if (compress) { |
512 | if (!btrfs_test_opt(root, COMPRESS)) | 512 | if (!btrfs_test_opt(root, COMPRESS)) |
513 | btrfs_info(root->fs_info, | 513 | btrfs_info(root->fs_info, |
514 | "btrfs: use %s compression\n", | 514 | "btrfs: use %s compression", |
515 | compress_type); | 515 | compress_type); |
516 | } | 516 | } |
517 | break; | 517 | break; |
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index be8d6714494e..7d725a9ce670 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -4133,7 +4133,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, | |||
4133 | if (!devs_max) | 4133 | if (!devs_max) |
4134 | devs_max = BTRFS_MAX_DEVS_SYS_CHUNK; | 4134 | devs_max = BTRFS_MAX_DEVS_SYS_CHUNK; |
4135 | } else { | 4135 | } else { |
4136 | btrfs_err(info, "invalid chunk type 0x%llx requested\n", | 4136 | btrfs_err(info, "invalid chunk type 0x%llx requested", |
4137 | type); | 4137 | type); |
4138 | BUG_ON(1); | 4138 | BUG_ON(1); |
4139 | } | 4139 | } |
@@ -4381,7 +4381,7 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans, | |||
4381 | 4381 | ||
4382 | if (em->start != chunk_offset || em->len != chunk_size) { | 4382 | if (em->start != chunk_offset || em->len != chunk_size) { |
4383 | btrfs_crit(extent_root->fs_info, "found a bad mapping, wanted" | 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 | chunk_size, em->start, em->len); | 4385 | chunk_size, em->start, em->len); |
4386 | free_extent_map(em); | 4386 | free_extent_map(em); |
4387 | return -EINVAL; | 4387 | return -EINVAL; |
@@ -4583,14 +4583,14 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) | |||
4583 | * and exit, so return 1 so the callers don't try to use other copies. | 4583 | * and exit, so return 1 so the callers don't try to use other copies. |
4584 | */ | 4584 | */ |
4585 | if (!em) { | 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 | logical+len); | 4587 | logical+len); |
4588 | return 1; | 4588 | return 1; |
4589 | } | 4589 | } |
4590 | 4590 | ||
4591 | if (em->start > logical || em->start + em->len < logical) { | 4591 | if (em->start > logical || em->start + em->len < logical) { |
4592 | btrfs_crit(fs_info, "Invalid mapping for %Lu-%Lu, got " | 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 | em->start + em->len); | 4594 | em->start + em->len); |
4595 | free_extent_map(em); | 4595 | free_extent_map(em); |
4596 | return 1; | 4596 | return 1; |
@@ -4771,7 +4771,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, | |||
4771 | 4771 | ||
4772 | if (em->start > logical || em->start + em->len < logical) { | 4772 | if (em->start > logical || em->start + em->len < logical) { |
4773 | btrfs_crit(fs_info, "found a bad mapping, wanted %Lu, " | 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 | em->start + em->len); | 4775 | em->start + em->len); |
4776 | free_extent_map(em); | 4776 | free_extent_map(em); |
4777 | return -EINVAL; | 4777 | return -EINVAL; |