Module Name: src
Committed By: pgoyette
Date: Sun Sep 23 03:44:04 UTC 2018
Modified Files:
src/sys/dev/raidframe [pgoyette-compat]: rf_compat50.c
src/sys/modules/compat_crypto_50 [pgoyette-compat]: Makefile
src/sys/opencrypto [pgoyette-compat]: ocryptodev.c ocryptodev.h
Log Message:
Fix some thinkos/pastos/typos
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/compat_crypto_50/Makefile
cvs rdiff -u -r1.11.2.6 -r1.11.2.7 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.3.16.3 -r1.3.16.4 src/sys/opencrypto/ocryptodev.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.3.2.5 src/sys/dev/raidframe/rf_compat50.c:1.3.2.6
--- src/sys/dev/raidframe/rf_compat50.c:1.3.2.5 Sun Sep 23 01:33:25 2018
+++ src/sys/dev/raidframe/rf_compat50.c Sun Sep 23 03:44:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.c,v 1.3.2.5 2018/09/23 01:33:25 pgoyette Exp $ */
+/* $NetBSD: rf_compat50.c,v 1.3.2.6 2018/09/23 03:44:04 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -264,10 +264,10 @@ raid_50_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
- MODULE_CMD_INIT:
+ case MODULE_CMD_INIT:
raidframe_50_init();
return 0;
- MODULE_CMD_FINI:
+ case MODULE_CMD_FINI:
raidframe_50_fini();
return 0;
default:
Index: src/sys/modules/compat_crypto_50/Makefile
diff -u src/sys/modules/compat_crypto_50/Makefile:1.1.2.1 src/sys/modules/compat_crypto_50/Makefile:1.1.2.2
--- src/sys/modules/compat_crypto_50/Makefile:1.1.2.1 Sun Sep 23 01:33:26 2018
+++ src/sys/modules/compat_crypto_50/Makefile Sun Sep 23 03:44:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.1 2018/09/23 01:33:26 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.2.2 2018/09/23 03:44:04 pgoyette Exp $
.include "../Makefile.inc"
@@ -7,6 +7,6 @@ CPPFLAGS+= -DCOMPAT_50
.PATH: ${S}/opencrypto
KMOD= crypto
-SRCS= ocryptodev.c ocryptodev.c
+SRCS= ocryptodev.c
.include <bsd.kmodule.mk>
Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.11.2.6 src/sys/opencrypto/ocryptodev.c:1.11.2.7
--- src/sys/opencrypto/ocryptodev.c:1.11.2.6 Sun Sep 23 01:33:26 2018
+++ src/sys/opencrypto/ocryptodev.c Sun Sep 23 03:44:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.11.2.6 2018/09/23 01:33:26 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.11.2.7 2018/09/23 03:44:04 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.6 2018/09/23 01:33:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.7 2018/09/23 03:44:04 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,8 @@ static int ocryptodev_op(struct csession
static int ocryptodev_mop(struct fcrypt *, struct ocrypt_n_op *, int,
struct lwp *);
static int ocryptodev_session(struct fcrypt *, struct osession_op *);
-static int ocryptodev_msession(struct fcrypt *, struct osession_n_op *);
+static int ocryptodev_msession(struct fcrypt *, struct osession_n_op *,
+ int);
int
ocryptof_ioctl(struct file *fp, u_long cmd, void *data)
@@ -153,10 +154,10 @@ mbail:
kmem_free(osnop, osgop->count * sizeof(struct osession_n_op));
break;
case OCIOCCRYPT:
- mutex_enter(mtx);
+ mutex_enter(&cryptodev_mtx);
ocop = (struct ocrypt_op *)data;
- cse = cryptodev_csefind)(fcr, ocop->ses);
- mutex_exit(mtx);
+ cse = cryptodev_csefind(fcr, ocop->ses);
+ mutex_exit(&cryptodev_mtx);
if (cse == NULL) {
DPRINTF("csefind failed\n");
return EINVAL;
@@ -310,10 +311,10 @@ compat_crypto_50_modcmd(modcmd_t cmd, vo
{
switch (cmd) {
- MODULE_CMD_INIT:
+ case MODULE_CMD_INIT:
crypto_50_init();
return 0;
- MODULE_CMD_FINI:
+ case MODULE_CMD_FINI:
crypto_50_fini();
return 0;
default:
Index: src/sys/opencrypto/ocryptodev.h
diff -u src/sys/opencrypto/ocryptodev.h:1.3.16.3 src/sys/opencrypto/ocryptodev.h:1.3.16.4
--- src/sys/opencrypto/ocryptodev.h:1.3.16.3 Sat Sep 22 10:42:00 2018
+++ src/sys/opencrypto/ocryptodev.h Sun Sep 23 03:44:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.h,v 1.3.16.3 2018/09/22 10:42:00 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.h,v 1.3.16.4 2018/09/23 03:44:04 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -176,11 +176,7 @@ struct csession;
struct crypt_op;
struct crypt_n_op;
-int ocryptof_ioctl(struct file *, u_long, void *, kmutex_t *,
- int (*)(struct fcrypt *, struct session_op *),
- int (*)(struct csession *, struct crypt_op *, struct lwp *),
- int (*)(struct fcrypt *, struct crypt_n_op *, int, struct lwp *),
- struct csession * (*)(struct fcrypt *, u_int32_t));
+int ocryptof_ioctl(struct file *, u_long, void *);
void cryptodev_50_init(void);
void cryptodev_50_fini(void);
