diff options
| author | David Sterba <dsterba@suse.cz> | 2014-09-30 01:33:33 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-10-02 16:15:21 +0200 |
| commit | ee39b432b4ac083acdafd7b4f156283722e3bf14 (patch) | |
| tree | d74c00763ec0145fe39d01e45a47cf0b550099ca /fs/btrfs/file.c | |
| parent | 5d99a998f375b7bff7ddff0162a6eed4d4ca1318 (diff) | |
| download | linux-ee39b432b4ac083acdafd7b4f156283722e3bf14.tar.bz2 | |
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/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 29b147d46b0a..a18ceabd99a8 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -452,7 +452,7 @@ static noinline int btrfs_copy_from_user(loff_t pos, int num_pages, if (unlikely(copied == 0)) break; - if (unlikely(copied < PAGE_CACHE_SIZE - offset)) { + if (copied < PAGE_CACHE_SIZE - offset) { offset += copied; } else { pg++; @@ -1792,7 +1792,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, if (sync) atomic_inc(&BTRFS_I(inode)->sync_writers); - if (unlikely(file->f_flags & O_DIRECT)) { + if (file->f_flags & O_DIRECT) { num_written = __btrfs_direct_write(iocb, from, pos); } else { num_written = __btrfs_buffered_write(file, from, pos); |