Module Name: src
Committed By: mlelstv
Date: Sat Feb 29 14:44:44 UTC 2020
Modified Files:
src/sys/kern: subr_disk_open.c
Log Message:
Make getdiskinfo() compatible with a DIOCGWEDGEINFO.
dkw_parent is defined to hold the disk name as used by disk_find(), not
a partition (i.e. no partition letter appended).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/kern/subr_disk_open.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_disk_open.c
diff -u src/sys/kern/subr_disk_open.c:1.14 src/sys/kern/subr_disk_open.c:1.15
--- src/sys/kern/subr_disk_open.c:1.14 Wed Feb 20 10:02:51 2019
+++ src/sys/kern/subr_disk_open.c Sat Feb 29 14:44:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk_open.c,v 1.14 2019/02/20 10:02:51 hannken Exp $ */
+/* $NetBSD: subr_disk_open.c,v 1.15 2020/02/29 14:44:44 mlelstv Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_open.c,v 1.14 2019/02/20 10:02:51 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_open.c,v 1.15 2020/02/29 14:44:44 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -160,7 +160,8 @@ getdiskinfo(struct vnode *vp, struct dkw
dkw->dkw_wname[0] = '\0';
- strlcpy(dkw->dkw_parent, dkw->dkw_devname, sizeof(dkw->dkw_parent));
+ snprintf(dkw->dkw_parent, sizeof(dkw->dkw_parent), "%s%" PRId32,
+ devsw_blk2name(major(dev)), DISKUNIT(dev));
dkw->dkw_size = pi.pi_size;
dkw->dkw_offset = pi.pi_offset;
