fs/: remove caller signal_pending branch predictions

This is already done for us internally by the signal machinery.

[akpm@linux-foundation.org: fix fs/buffer.c]
Link: http://lkml.kernel.org/r/20181116002713.8474-7-dave@stgolabs.net
Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c
index fde6b4d..3a9eaec 100644 (file)
--- a/fs/afs/fs_probe.c
+++ b/fs/afs/fs_probe.c
@@ -247,7 +247,7 @@ int afs_wait_for_fs_probes(struct afs_server_list *slist, unsigned long untried)
                        }
                }
 
-               if (!still_probing || unlikely(signal_pending(current)))
+               if (!still_probing || signal_pending(current))
                        goto stop;
                schedule();
        }

diff --git a/fs/afs/vl_probe.c b/fs/afs/vl_probe.c
index f0b0329..f402ee8 100644 (file)
--- a/fs/afs/vl_probe.c
+++ b/fs/afs/vl_probe.c
@@ -248,7 +248,7 @@ int afs_wait_for_vl_probes(struct afs_vlserver_list *vllist,
                        }
                }
 
-               if (!still_probing || unlikely(signal_pending(current)))
+               if (!still_probing || signal_pending(current))
                        goto stop;
                schedule();
        }

diff --git a/fs/buffer.c b/fs/buffer.c
index d60d61e..52d024b 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2366,7 +2366,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,
 
                balance_dirty_pages_ratelimited(mapping);
 
-               if (unlikely(fatal_signal_pending(current))) {
+               if (fatal_signal_pending(current)) {
                        err = -EINTR;
                        goto out;
                }

diff --git a/fs/exec.c b/fs/exec.c
index ea7d439..44320d8 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1087,7 +1087,7 @@ static int de_thread(struct task_struct *tsk)
                __set_current_state(TASK_KILLABLE);
                spin_unlock_irq(lock);
                schedule();
-               if (unlikely(__fatal_signal_pending(tsk)))
+               if (__fatal_signal_pending(tsk))
                        goto killed;
                spin_lock_irq(lock);
        }
@@ -1115,7 +1115,7 @@ static int de_thread(struct task_struct *tsk)
                        write_unlock_irq(&tasklist_lock);
                        cgroup_threadgroup_change_end(tsk);
                        schedule();
-                       if (unlikely(__fatal_signal_pending(tsk)))
+                       if (__fatal_signal_pending(tsk))
                                goto killed;
                }
 

diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c
index c4e98c9..443bcd8 100644 (file)
--- a/fs/orangefs/orangefs-bufmap.c
+++ b/fs/orangefs/orangefs-bufmap.c
@@ -105,7 +105,7 @@ static int wait_for_free(struct slot_map *m)
                        left = t;
                else
                        left = t + (left - n);
-               if (unlikely(signal_pending(current)))
+               if (signal_pending(current))
                        left = -EINTR;
        } while (left > 0);