btrfs: annotate unlikely branches after V0 extent type removal
[sfrench/cifs-2.6.git] / fs / btrfs / relocation.c
index eaf59c742dc8251ceed499d6aacb2fbda7887ed0..229f721cbde9bb1af9c8c36b7ff39aa6ebacec43 100644 (file)
@@ -830,7 +830,7 @@ again:
                        edge->node[UPPER] = upper;
 
                        goto next;
-               } else if (key.type == BTRFS_EXTENT_REF_V0_KEY) {
+               } else if (unlikely(key.type == BTRFS_EXTENT_REF_V0_KEY)) {
                        err = -EINVAL;
                        btrfs_print_v0_err(rc->extent_root->fs_info);
                        btrfs_handle_fs_error(rc->extent_root->fs_info, err,
@@ -3325,7 +3325,7 @@ static int add_tree_block(struct reloc_control *rc,
                        level = (int)extent_key->offset;
                }
                generation = btrfs_extent_generation(eb, ei);
-       } else if (item_size == sizeof(struct btrfs_extent_item_v0)) {
+       } else if (unlikely(item_size == sizeof(struct btrfs_extent_item_v0))) {
                btrfs_print_v0_err(eb->fs_info);
                btrfs_handle_fs_error(eb->fs_info, -EINVAL, NULL);
                return -EINVAL;
@@ -3742,7 +3742,7 @@ int add_data_references(struct reloc_control *rc,
                                              struct btrfs_extent_data_ref);
                        ret = find_data_references(rc, extent_key,
                                                   eb, dref, blocks);
-               } else if (key.type == BTRFS_EXTENT_REF_V0_KEY) {
+               } else if (unlikely(key.type == BTRFS_EXTENT_REF_V0_KEY)) {
                        btrfs_print_v0_err(eb->fs_info);
                        btrfs_handle_fs_error(eb->fs_info, -EINVAL, NULL);
                        ret = -EINVAL;
@@ -3984,7 +3984,7 @@ restart:
                        flags = btrfs_extent_flags(path->nodes[0], ei);
                        ret = check_extent_flags(flags);
                        BUG_ON(ret);
-               } else if (item_size == sizeof(struct btrfs_extent_item_v0)) {
+               } else if (unlikely(item_size == sizeof(struct btrfs_extent_item_v0))) {
                        err = -EINVAL;
                        btrfs_print_v0_err(trans->fs_info);
                        btrfs_abort_transaction(trans, err);