mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
Simplify issig().
We always call it twice with JUSTLOOKING and then FORREAL. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Pawel Jakub Dawidek <pawel@dawidek.net> Closes #16225
This commit is contained in:
committed by
Tony Hutter
parent
e5e4957a54
commit
a6198f34bd
@@ -152,26 +152,16 @@ spl_kthread_create(int (*func)(void *), void *data, const char namefmt[], ...)
|
||||
EXPORT_SYMBOL(spl_kthread_create);
|
||||
|
||||
/*
|
||||
* The "why" argument indicates the allowable side-effects of the call:
|
||||
*
|
||||
* FORREAL: Extract the next pending signal from p_sig into p_cursig;
|
||||
* stop the process if a stop has been requested or if a traced signal
|
||||
* is pending.
|
||||
*
|
||||
* JUSTLOOKING: Don't stop the process, just indicate whether or not
|
||||
* a signal might be pending (FORREAL is needed to tell for sure).
|
||||
* Extract the next pending signal from p_sig into p_cursig; stop the process
|
||||
* if a stop has been requested or if a traced signal is pending.
|
||||
*/
|
||||
int
|
||||
issig(int why)
|
||||
issig(void)
|
||||
{
|
||||
ASSERT(why == FORREAL || why == JUSTLOOKING);
|
||||
|
||||
if (!signal_pending(current))
|
||||
return (0);
|
||||
|
||||
if (why != FORREAL)
|
||||
return (1);
|
||||
|
||||
struct task_struct *task = current;
|
||||
spl_kernel_siginfo_t __info;
|
||||
sigset_t set;
|
||||
|
||||
@@ -116,7 +116,7 @@ diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
|
||||
dmu_diffarg_t *da = arg;
|
||||
int err = 0;
|
||||
|
||||
if (issig(JUSTLOOKING) && issig(FORREAL))
|
||||
if (issig())
|
||||
return (SET_ERROR(EINTR));
|
||||
|
||||
if (zb->zb_level == ZB_DNODE_LEVEL ||
|
||||
|
||||
@@ -2365,7 +2365,7 @@ dmu_objset_space_upgrade(objset_t *os)
|
||||
if (err != 0)
|
||||
return (err);
|
||||
|
||||
if (issig(JUSTLOOKING) && issig(FORREAL))
|
||||
if (issig())
|
||||
return (SET_ERROR(EINTR));
|
||||
|
||||
objerr = dmu_bonus_hold(os, obj, FTAG, &db);
|
||||
|
||||
@@ -3386,7 +3386,7 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, offset_t *voffp)
|
||||
* stream, then we free drc->drc_rrd and exit.
|
||||
*/
|
||||
while (rwa->err == 0) {
|
||||
if (issig(JUSTLOOKING) && issig(FORREAL)) {
|
||||
if (issig()) {
|
||||
err = SET_ERROR(EINTR);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -912,7 +912,7 @@ perform_redaction(objset_t *os, redaction_list_t *rl,
|
||||
object = prev_obj;
|
||||
}
|
||||
while (err == 0 && object <= rec->end_object) {
|
||||
if (issig(JUSTLOOKING) && issig(FORREAL)) {
|
||||
if (issig()) {
|
||||
err = EINTR;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -2552,7 +2552,7 @@ dmu_send_impl(struct dmu_send_params *dspp)
|
||||
while (err == 0 && !range->eos_marker) {
|
||||
err = do_dump(&dsc, range);
|
||||
range = get_next_range(&srt_arg->q, range);
|
||||
if (issig(JUSTLOOKING) && issig(FORREAL))
|
||||
if (issig())
|
||||
err = SET_ERROR(EINTR);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -780,8 +780,7 @@ zcp_lua_counthook(lua_State *state, lua_Debug *ar)
|
||||
* Check if we were canceled while waiting for the
|
||||
* txg to sync or from our open context thread
|
||||
*/
|
||||
if (ri->zri_canceled ||
|
||||
(!ri->zri_sync && issig(JUSTLOOKING) && issig(FORREAL))) {
|
||||
if (ri->zri_canceled || (!ri->zri_sync && issig())) {
|
||||
ri->zri_canceled = B_TRUE;
|
||||
(void) lua_pushstring(state, "Channel program was canceled.");
|
||||
(void) lua_error(state);
|
||||
|
||||
@@ -2336,7 +2336,7 @@ zfs_ioc_snapshot_list_next(zfs_cmd_t *zc)
|
||||
}
|
||||
|
||||
while (error == 0) {
|
||||
if (issig(JUSTLOOKING) && issig(FORREAL)) {
|
||||
if (issig()) {
|
||||
error = SET_ERROR(EINTR);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1419,7 +1419,7 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp,
|
||||
len -= size;
|
||||
done += size;
|
||||
|
||||
if (issig(JUSTLOOKING) && issig(FORREAL)) {
|
||||
if (issig()) {
|
||||
error = SET_ERROR(EINTR);
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user