Convert lockmgr locks from using simple locks to using mutexes.

Add lockdestroy() and appropriate invocations, which corresponds to
lockinit() and must be called to clean up after a lockmgr lock is no
longer needed.

3 files changed, 10 insertions, 0 deletions

diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index 3cfc449..df86f99 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -79,6 +79,13 @@ ncp_conn_init(void) {
 }
 
 int
+ncp_conn_destroy(void) {
+	lockdestroy(&listlock);
+	lockdestroy(&lhlock);
+	return 0;
+}
+
+int
 ncp_conn_locklist(int flags, struct proc *p){
 	return lockmgr(&listlock, flags | LK_CANRECURSE, 0, p);
 }
@@ -231,6 +238,7 @@ ncp_conn_free(struct ncp_conn *ncp) {
 	 * if signal is raised - how I do react ?
 	 */
 	lockmgr(&ncp->nc_lock, LK_DRAIN, 0, ncp->procp);
+	lockdestroy(&ncp->nc_lock);
 	while (ncp->nc_lwant) {
 		printf("lwant = %d\n", ncp->nc_lwant);
 		tsleep(&ncp->nc_lwant, PZERO,"ncpdr",2*hz);
diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h
index 850e5e7..0171421 100644
--- a/sys/netncp/ncp_conn.h
+++ b/sys/netncp/ncp_conn.h
@@ -204,6 +204,7 @@ struct ncp_conn {
 #define ncp_conn_invalidate(conn) 	{conn->flags |= NCPFL_INVALID;}
 
 int  ncp_conn_init(void);
+int  ncp_conn_destroy(void);
 int  ncp_conn_alloc(struct proc *p,struct ucred *cred, struct ncp_conn **connid);
 int  ncp_conn_free(struct ncp_conn *conn);
 int  ncp_conn_access(struct ncp_conn *conn,struct ucred *cred,mode_t mode);
diff --git a/sys/netncp/ncp_subr.c b/sys/netncp/ncp_subr.c
index a14e3f0..4601690 100644
--- a/sys/netncp/ncp_subr.c
+++ b/sys/netncp/ncp_subr.c
@@ -124,6 +124,7 @@ ncp_done(void) {
 			ncp_conn_unlock(ncp,p);
 	}
 	ncp_conn_unlocklist(p);
+	ncp_conn_destroy();
 }