diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-01-21 05:52:26 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-01-21 05:52:26 +0000 |
| commit | 4ac72f30ea411a8324de0d2c5ac9974e4715f3b4 (patch) | |
| tree | 4f52a64ba48687f81bad472e989dd80ed989e75f /sys/dev | |
| parent | 917bc82067c394e46982431797a857de3157d03f (diff) | |
Do not bother calling splvm around crypto_invoke(), as crypto_invoke()
already calls splvm as necessary.
ok mikeb@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/softraid_crypto.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c index f31f88891c2..5fa78d0a867 100644 --- a/sys/dev/softraid_crypto.c +++ b/sys/dev/softraid_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_crypto.c,v 1.106 2014/01/21 05:22:21 jsing Exp $ */ +/* $OpenBSD: softraid_crypto.c,v 1.107 2014/01/21 05:52:25 jsing Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> @@ -1120,11 +1120,9 @@ sr_crypto_rw(struct sr_workunit *wu) if (wu->swu_xs->flags & SCSI_DATA_OUT) { crwu = sr_crypto_prepare(wu, 1); crwu->cr_crp->crp_callback = sr_crypto_write; - s = splvm(); rv = crypto_invoke(crwu->cr_crp); if (rv == 0) rv = crwu->cr_crp->crp_etype; - splx(s); } else rv = sr_crypto_dev_rw(wu, NULL); @@ -1199,11 +1197,9 @@ sr_crypto_done(struct sr_workunit *wu) if (ISSET(xs->flags, SCSI_DATA_IN) && xs->error == XS_NOERROR) { crwu = sr_crypto_prepare(wu, 0); crwu->cr_crp->crp_callback = sr_crypto_read; - DNPRINTF(SR_D_INTR, "%s: sr_crypto_intr: crypto_invoke %p\n", + DNPRINTF(SR_D_INTR, "%s: sr_crypto_done: crypto_invoke %p\n", DEVNAME(wu->swu_dis->sd_sc), crwu->cr_crp); - s = splvm(); crypto_invoke(crwu->cr_crp); - splx(s); return; } |