summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/transaction.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2014-09-30 01:33:33 +0200
committerDavid Sterba <dsterba@suse.cz>2014-10-02 16:15:21 +0200
commitee39b432b4ac083acdafd7b4f156283722e3bf14 (patch)
treed74c00763ec0145fe39d01e45a47cf0b550099ca /fs/btrfs/transaction.c
parent5d99a998f375b7bff7ddff0162a6eed4d4ca1318 (diff)
downloadlinux-stable-ee39b432b4ac083acdafd7b4f156283722e3bf14.tar.gz
linux-stable-ee39b432b4ac083acdafd7b4f156283722e3bf14.tar.bz2
linux-stable-ee39b432b4ac083acdafd7b4f156283722e3bf14.zip
btrfs: remove unlikely from data-dependent branches and slow paths
There are the branch hints that obviously depend on the data being processed, the CPU predictor will do better job according to the actual load. It also does not make sense to use the hints in slow paths that do a lot of other operations like locking, waiting or IO. Signed-off-by: David Sterba <dsterba@suse.cz>
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 16d0c1b62b3e..8eded14e8c5c 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;
}