openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Davidlohr Bueso 2019-01-03 15:28:58 -08:00 committed by Linus Torvalds
parent fa45f1162f
commit 08d405c8b8
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/afs/fs_probe.c
View File

@ -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();
}

2
fs/afs/vl_probe.c
View File

@ -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();
}

2
fs/buffer.c
View File

@ -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;
}

4
fs/exec.c
View File

@ -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;
}

2
fs/orangefs/orangefs-bufmap.c
View File

@ -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);