summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2013-04-01 15:17:33 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2013-04-01 15:17:33 +0000
commit2d74aba0be1c2781cbf9988ff29e3213ddeb7ed4 (patch)
tree54e3274061840e59e39726e0391f2fe03ce8427b /sys
parent738ec3800fadf9d87d0af5c9330210c30d93d6ac (diff)
Rename sr_crypto_rw2() to sr_crypto_dev_rw(), which actually reflects the
fact that it is used to generate I/O to the underlying device. Input from/ok krw@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/softraid_crypto.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c
index d488dd008d4..b3a64706a8d 100644
--- a/sys/dev/softraid_crypto.c
+++ b/sys/dev/softraid_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_crypto.c,v 1.92 2013/04/01 07:58:43 jsing Exp $ */
+/* $OpenBSD: softraid_crypto.c,v 1.93 2013/04/01 15:17:32 jsing Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org>
@@ -94,7 +94,7 @@ int sr_crypto_meta_opt_handler(struct sr_discipline *,
struct sr_meta_opt_hdr *);
int sr_crypto_write(struct cryptop *);
int sr_crypto_rw(struct sr_workunit *);
-int sr_crypto_rw2(struct sr_workunit *, struct sr_crypto_wu *);
+int sr_crypto_dev_rw(struct sr_workunit *, struct sr_crypto_wu *);
void sr_crypto_done(struct sr_workunit *);
int sr_crypto_read(struct cryptop *);
void sr_crypto_finish_io(struct sr_workunit *);
@@ -1180,7 +1180,7 @@ sr_crypto_rw(struct sr_workunit *wu)
rv = crwu->cr_crp->crp_etype;
splx(s);
} else
- rv = sr_crypto_rw2(wu, NULL);
+ rv = sr_crypto_dev_rw(wu, NULL);
return (rv);
}
@@ -1203,11 +1203,11 @@ sr_crypto_write(struct cryptop *crp)
splx(s);
}
- return (sr_crypto_rw2(wu, crwu));
+ return (sr_crypto_dev_rw(wu, crwu));
}
int
-sr_crypto_rw2(struct sr_workunit *wu, struct sr_crypto_wu *crwu)
+sr_crypto_dev_rw(struct sr_workunit *wu, struct sr_crypto_wu *crwu)
{
struct sr_discipline *sd = wu->swu_dis;
struct scsi_xfer *xs = wu->swu_xs;