Module Name: src
Committed By: christos
Date: Wed Apr 27 02:19:12 UTC 2016
Modified Files:
src/sys/dev/dkwedge: dk.c
src/sys/sys: disk.h
Log Message:
Add dkwedge_find_by_parent()
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/dkwedge/dk.c
cvs rdiff -u -r1.66 -r1.67 src/sys/sys/disk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.88 src/sys/dev/dkwedge/dk.c:1.89
--- src/sys/dev/dkwedge/dk.c:1.88 Fri Jan 15 02:48:22 2016
+++ src/sys/dev/dkwedge/dk.c Tue Apr 26 22:19:12 2016
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
*/
#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"
@@ -761,6 +761,23 @@ dkwedge_find_by_wname(const char *wname)
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)
{
Index: src/sys/sys/disk.h
diff -u src/sys/sys/disk.h:1.66 src/sys/sys/disk.h:1.67
--- src/sys/sys/disk.h:1.66 Thu Nov 12 10:25:22 2015
+++ src/sys/sys/disk.h Tue Apr 26 22:19:12 2016
@@ -1,4 +1,4 @@
-/* $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.
@@ -547,9 +547,11 @@ int dkwedge_list(struct disk *, struct d
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_ */
