summaryrefslogtreecommitdiff
path: root/fs/btrfs/transaction.c
diff options
context:
space:
mode:
authorChris Mason <clm@fb.com>2014-10-04 20:57:44 +0400
committerChris Mason <clm@fb.com>2014-10-04 20:57:44 +0400
commit0ec31a61f0d46e03e9e80c2ff57fa3ae2fdf92d3 (patch)
treecb56a470a5b8ed52cde9417d7bfa6f94349b4c38 /fs/btrfs/transaction.c
parent27b19cc8864e206c4203041892b0f706f044a0f1 (diff)
parentee39b432b4ac083acdafd7b4f156283722e3bf14 (diff)
downloadlinux-0ec31a61f0d46e03e9e80c2ff57fa3ae2fdf92d3.tar.xz
Merge branch 'remove-unlikely' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/transaction.c')
-rw-r--r--fs/btrfs/transaction.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 0bcdcc65627f..dcaae3616728 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -418,7 +418,7 @@ start_transaction(struct btrfs_root *root, u64 num_items, unsigned int type,
/*
* Do the reservation for the relocation root creation
*/
- if (unlikely(need_reserve_reloc_root(root))) {
+ if (need_reserve_reloc_root(root)) {
num_bytes += root->nodesize;
reloc_reserved = true;
}