use rwlocks instead of hand-rolled. make the softc private parts private.

this means making ccdconfig "SMALL" to turn off the kvm groveling nonsense
ok deraadt millert pedro todd

2 files changed, 36 insertions, 62 deletions

diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 85efc4fa6de..8459e64b2f9 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.69 2007/03/30 15:19:05 deraadt Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.70 2007/04/06 06:41:42 tedu Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -112,6 +112,7 @@
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 #include <sys/conf.h>
+#include <sys/rwlock.h>
 
 #include <dev/ccdvar.h>
 
@@ -122,6 +123,31 @@
 #endif
 
 /*
+ * A concatenated disk is described after initialization by this structure.
+ */
+struct ccd_softc {
+	struct disk	sc_dkdev;		/* generic disk device info */
+	struct ccdgeom	sc_geom;		/* pseudo geometry info */
+	struct ccdcinfo	*sc_cinfo;		/* component info */
+	struct ccdiinfo	*sc_itable;		/* interleave table */
+	char		sc_xname[8];		/* XXX external name */
+	size_t		sc_size;		/* size of ccd */
+	int		sc_flags;		/* flags */
+	int		sc_cflags;		/* copy of ccd_flags */
+	int		sc_ileave;		/* interleave */
+	u_int		sc_nccdisks;		/* # of components */
+	u_int		sc_nccunits;		/* # of components for data */
+	struct rwlock	sc_rwlock;		/* lock */
+
+};
+
+/* sc_flags */
+#define CCDF_INITED	0x01	/* unit has been initialized */
+#define CCDF_WLABEL	0x02	/* label area is writable */
+#define CCDF_LABELLING	0x04	/* unit is currently being labelled */
+
+
+/*
  * Overridable value telling how many kvm spaces of MAXBSIZE we need for
  * component I/O operations.
  */
@@ -182,11 +208,12 @@ long	ccdbuffer(struct ccd_softc *, struct buf *, daddr_t, caddr_t,
     long, struct ccdbuf **, int);
 void	ccdgetdisklabel(dev_t, struct ccd_softc *, struct disklabel *,
     struct cpu_disklabel *, int);
-int	ccdlock(struct ccd_softc *);
-void	ccdunlock(struct ccd_softc *);
 INLINE struct ccdbuf *getccdbuf(void);
 INLINE void putccdbuf(struct ccdbuf *);
 
+#define ccdlock(sc) rw_enter(&sc->sc_rwlock, RW_WRITE|RW_INTR)
+#define ccdunlock(sc) rw_exit_write(&sc->sc_rwlock)
+
 #ifdef CCDDEBUG
 void	printiinfo(struct ccdiinfo *);
 #endif
@@ -240,6 +267,8 @@ putccdbuf(struct ccdbuf *cbp)
 void
 ccdattach(int num)
 {
+	int i;
+
 	if (num <= 0) {
 #ifdef DIAGNOSTIC
 		panic("ccdattach: count <= 0");
@@ -259,6 +288,9 @@ ccdattach(int num)
 			free(ccddevs, M_DEVBUF);
 		return;
 	}
+	for (i = 0; i < num; i++) {
+		rw_init(&ccd_softc[i].sc_rwlock, "ccdlock");
+	}
 	numccd = num;
 	bzero(ccd_softc, num * sizeof(struct ccd_softc));
 	bzero(ccddevs, num * sizeof(struct ccddevice));
@@ -1522,40 +1554,6 @@ ccdgetdisklabel(dev_t dev, struct ccd_softc *cs, struct disklabel *lp,
 		CCD_DPRINTF(CCDB_LABEL, ("%s: %s\n", cs->sc_xname, errstring));
 }
 
-/*
- * Wait interruptibly for an exclusive lock.
- *
- * XXX
- * Several drivers do this; it should be abstracted and made MP-safe.
- */
-int
-ccdlock(struct ccd_softc *cs)
-{
-	int error;
-
-	while ((cs->sc_flags & CCDF_LOCKED) != 0) {
-		cs->sc_flags |= CCDF_WANTED;
-		if ((error = tsleep(cs, PRIBIO | PCATCH, "ccdlck", 0)) != 0)
-			return (error);
-	}
-	cs->sc_flags |= CCDF_LOCKED;
-	return (0);
-}
-
-/*
- * Unlock and wake up any waiters.
- */
-void
-ccdunlock(struct ccd_softc *cs)
-{
-
-	cs->sc_flags &= ~CCDF_LOCKED;
-	if ((cs->sc_flags & CCDF_WANTED) != 0) {
-		cs->sc_flags &= ~CCDF_WANTED;
-		wakeup(cs);
-	}
-}
-
 #ifdef CCDDEBUG
 void
 printiinfo(struct ccdiinfo *ii)
diff --git a/sys/dev/ccdvar.h b/sys/dev/ccdvar.h
index e84334234b4..c3a7d7464d1 100644
--- a/sys/dev/ccdvar.h
+++ b/sys/dev/ccdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccdvar.h,v 1.8 2005/03/25 17:51:16 mickey Exp $	*/
+/*	$OpenBSD: ccdvar.h,v 1.9 2007/04/06 06:41:42 tedu Exp $	*/
 /*	$NetBSD: ccdvar.h,v 1.11 1996/02/28 01:08:32 thorpej Exp $	*/
 
 /*-
@@ -181,30 +181,6 @@ struct ccdgeom {
 };
 
 /*
- * A concatenated disk is described after initialization by this structure.
- */
-struct ccd_softc {
-	struct disk	sc_dkdev;		/* generic disk device info */
-	struct ccdgeom	sc_geom;		/* pseudo geometry info */
-	struct ccdcinfo	*sc_cinfo;		/* component info */
-	struct ccdiinfo	*sc_itable;		/* interleave table */
-	char		sc_xname[8];		/* XXX external name */
-	size_t		sc_size;		/* size of ccd */
-	int		sc_flags;		/* flags */
-	int		sc_cflags;		/* copy of ccd_flags */
-	int		sc_ileave;		/* interleave */
-	u_int		sc_nccdisks;		/* # of components */
-	u_int		sc_nccunits;		/* # of components for data */
-};
-
-/* sc_flags */
-#define CCDF_INITED	0x01	/* unit has been initialized */
-#define CCDF_WLABEL	0x02	/* label area is writable */
-#define CCDF_LABELLING	0x04	/* unit is currently being labelled */
-#define CCDF_WANTED	0x40	/* someone is waiting to obtain a lock */
-#define CCDF_LOCKED	0x80	/* unit is locked */
-
-/*
  * Before you can use a unit, it must be configured with CCDIOCSET.
  * The configuration persists across opens and closes of the device;
  * a CCDIOCCLR must be used to reset a configuration.  An attempt to