net/mlx4: Fix firmware command timeout during interrupt test

[cascardo/linux.git] / fs / btrfs / root-tree.c

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 0912960..edae751 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -46,12 +46,7 @@ static void btrfs_read_root_item(struct extent_buffer *eb, int slot,
                != btrfs_root_generation_v2(item)) {
                if (btrfs_root_generation_v2(item) != 0) {
                        btrfs_warn(eb->fs_info,
-                                       "mismatching "
-                                       "generation and generation_v2 "
-                                       "found in root item. This root "
-                                       "was probably mounted with an "
-                                       "older kernel. Resetting all "
-                                       "new fields.");
+                                       "mismatching generation and generation_v2 found in root item. This root was probably mounted with an older kernel. Resetting all new fields.");
                }
                need_reset = 1;
        }
@@ -156,8 +151,9 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
 
        if (ret != 0) {
                btrfs_print_leaf(root, path->nodes[0]);
-               btrfs_crit(root->fs_info, "unable to update root key %llu %u %llu",
-                      key->objectid, key->type, key->offset);
+               btrfs_crit(root->fs_info,
+                          "unable to update root key %llu %u %llu",
+                          key->objectid, key->type, key->offset);
                BUG_ON(1);
        }
 
@@ -302,8 +298,7 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root)
                        if (IS_ERR(trans)) {
                                err = PTR_ERR(trans);
                                btrfs_handle_fs_error(tree_root->fs_info, err,
-                                           "Failed to start trans to delete "
-                                           "orphan item");
+                                           "Failed to start trans to delete orphan item");
                                break;
                        }
                        err = btrfs_del_orphan_item(trans, tree_root,
@@ -311,8 +306,7 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root)
                        btrfs_end_transaction(trans, tree_root);
                        if (err) {
                                btrfs_handle_fs_error(tree_root->fs_info, err,
-                                           "Failed to delete root orphan "
-                                           "item");
+                                           "Failed to delete root orphan item");
                                break;
                        }
                        continue;