 @@ -1,14 +1,14 @@
-/*	$NetBSD: dk.c,v 1.88 2016/01/15 07:48:22 mlelstv Exp $	*/
+/*	$NetBSD: dk.c,v 1.89 2016/04/27 02:19:12 christos Exp $	*/
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.88 2016/01/15 07:48:22 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.89 2016/04/27 02:19:12 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 @@ -751,26 +751,43 @@ dkwedge_find_by_wname(const char *wname)
 				printf(
 				    "WARNING: double match for wedge name %s "
 				    "(%s, %s)\n", wname, device_xname(dv),
 				    device_xname(sc->sc_dev));
 				continue;
+			}
 			dv = sc->sc_dev;
+		}
+	}
 	rw_exit(&dkwedges_lock);
 	return dv;
+}
 device_t
 dkwedge_find_by_parent(const char *name, size_t *i)
+{
 	rw_enter(&dkwedges_lock, RW_WRITER);
 	for (; *i < (size_t)ndkwedges; (*i)++) {
 		struct dkwedge_softc *sc;
 		if ((sc = dkwedges[*i]) == NULL)
 			continue;
 		if (strcmp(sc->sc_parent->dk_name, name) != 0)
 			continue;
 		rw_exit(&dkwedges_lock);
 		return sc->sc_dev;
+	}
 	rw_exit(&dkwedges_lock);
 	return NULL;
+}
 void
 dkwedge_print_wnames(void)
+{
 	struct dkwedge_softc *sc;
 	int i;
 	rw_enter(&dkwedges_lock, RW_WRITER);
 	for (i = 0; i < ndkwedges; i++) {
 		if ((sc = dkwedges[i]) == NULL)
 			continue;
 		printf(" wedge:%s", sc->sc_wname);
+	}
 	rw_exit(&dkwedges_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: disk.h,v 1.66 2015/11/12 15:25:22 christos Exp $	*/
+/*	$NetBSD: disk.h,v 1.67 2016/04/27 02:19:12 christos Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -537,19 +537,21 @@ void	disk_unbusy(struct disk *, long, in
 bool	disk_isbusy(struct disk *);
 struct disk *disk_find(const char *);
 int	disk_ioctl(struct disk *, dev_t, u_long, void *, int, struct lwp *);
 void	disk_set_info(device_t, struct disk *, const char *);
 void	dkwedge_init(void);
 int	dkwedge_add(struct dkwedge_info *);
 int	dkwedge_del(struct dkwedge_info *);
 void	dkwedge_delall(struct disk *);
 int	dkwedge_list(struct disk *, struct dkwedge_list *, struct lwp *);
 void	dkwedge_discover(struct disk *);
 int	dkwedge_read(struct disk *, struct vnode *, daddr_t, void *, size_t);
 device_t dkwedge_find_by_wname(const char *);
 device_t dkwedge_find_by_parent(const char *, size_t *);
 const char *dkwedge_get_parent_name(dev_t);
 void	dkwedge_print_wnames(void);
 device_t dkwedge_find_partition(device_t, daddr_t, uint64_t);
 #endif
 #endif /* _SYS_DISK_H_ */