Merge branch 'remove-unlikely' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus

6 files changed, 16 insertions, 16 deletions

diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index 2da0a66790ba..4dabeb893b7c 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -92,7 +92,7 @@ __btrfs_alloc_workqueue(const char *name, int flags, int max_active,
 {
         struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);
 
-        if (unlikely(!ret))
+        if (!ret)
                 return NULL;
 
         ret->max_active = max_active;
@@ -116,7 +116,7 @@ __btrfs_alloc_workqueue(const char *name, int flags, int max_active,
                 ret->normal_wq = alloc_workqueue("%s-%s", flags,
                                                  ret->max_active, "btrfs",
                                                  name);
-        if (unlikely(!ret->normal_wq)) {
+        if (!ret->normal_wq) {
                 kfree(ret);
                 return NULL;
         }
@@ -138,12 +138,12 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,
 {
         struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);
 
-        if (unlikely(!ret))
+        if (!ret)
                 return NULL;
 
         ret->normal = __btrfs_alloc_workqueue(name, flags & ~WQ_HIGHPRI,
                                               max_active, thresh);
-        if (unlikely(!ret->normal)) {
+        if (!ret->normal) {
                 kfree(ret);
                 return NULL;
         }
@@ -151,7 +151,7 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,
         if (flags & WQ_HIGHPRI) {
                 ret->high = __btrfs_alloc_workqueue(name, flags, max_active,
                                                     thresh);
-                if (unlikely(!ret->high)) {
+                if (!ret->high) {
                         __btrfs_destroy_workqueue(ret->normal);
                         kfree(ret);
                         return NULL;
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 9a5effa32a66..0d599ba1aaed 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -9690,7 +9690,7 @@ void btrfs_end_nocow_write(struct btrfs_root *root)
 
 int btrfs_start_nocow_write(struct btrfs_root *root)
 {
-        if (unlikely(atomic_read(&root->will_be_snapshoted)))
+        if (atomic_read(&root->will_be_snapshoted))
                 return 0;
 
         percpu_counter_inc(&root->subv_writers->counter);
@@ -9698,7 +9698,7 @@ int btrfs_start_nocow_write(struct btrfs_root *root)
          * Make sure counter is updated before we check for snapshot creation.
          */
         smp_mb();
-        if (unlikely(atomic_read(&root->will_be_snapshoted))) {
+        if (atomic_read(&root->will_be_snapshoted)) {
                 btrfs_end_nocow_write(root);
                 return 0;
         }
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);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 6c4da8446397..fc9c0439caa3 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7803,9 +7803,9 @@ static int btrfs_submit_direct_hook(int rw, struct btrfs_dio_private *dip,
         atomic_inc(&dip->pending_bios);
 
         while (bvec <= (orig_bio->bi_io_vec + orig_bio->bi_vcnt - 1)) {
-                if (unlikely(map_length < submit_len + bvec->bv_len ||
+                if (map_length < submit_len + bvec->bv_len ||
                     bio_add_page(bio, bvec->bv_page, bvec->bv_len,
-                                 bvec->bv_offset) < bvec->bv_len)) {
+                                 bvec->bv_offset) < bvec->bv_len) {
                         /*
                          * inc the count before we submit the bio so
                          * we know the end IO handler won't happen before
@@ -8018,8 +8018,8 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb,
                 ret = btrfs_delalloc_reserve_space(inode, count);
                 if (ret)
                         goto out;
-        } else if (unlikely(test_bit(BTRFS_INODE_READDIO_NEED_LOCK,
-                                     &BTRFS_I(inode)->runtime_flags))) {
+        } else if (test_bit(BTRFS_INODE_READDIO_NEED_LOCK,
+                                     &BTRFS_I(inode)->runtime_flags)) {
                 inode_dio_done(inode);
                 flags = DIO_LOCKING | DIO_SKIP_HOLES;
                 wakeup = false;
@@ -9014,7 +9014,7 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput,
                 spin_unlock(&root->delalloc_lock);
 
                 work = btrfs_alloc_delalloc_work(inode, 0, delay_iput);
-                if (unlikely(!work)) {
+                if (!work) {
                         if (delay_iput)
                                 btrfs_add_delayed_iput(inode);
                         else
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index fd9d19057e7e..e732274f1afd 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3166,7 +3166,7 @@ static void clone_update_extent_map(struct inode *inode,
                                         em->start + em->len - 1, 0);
         }
 
-        if (unlikely(ret))
+        if (ret)
                 set_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
                         &BTRFS_I(inode)->runtime_flags);
 }
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;
                 }