Module Name: src
Committed By: snj
Date: Mon Jun 1 19:19:44 UTC 2015
Modified Files:
src/share/man/man9 [netbsd-7]: disk.9
src/sys/dev [netbsd-7]: dksubr.c
src/sys/kern [netbsd-7]: subr_disk.c
src/sys/sys [netbsd-7]: dkio.h
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #775):
share/man/man9/disk.9: revision 1.37
sys/kern/subr_disk.c: revisions 1.104, 1.105
sys/dev/dksubr.c: revision 1.56
sys/sys/dkio.h: revision 1.21
Implement DIOCGMEDIASIZE and DIOCGSECTORSIZE from FreeBSD.
--
clear error for new ioctls.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.24.1 src/share/man/man9/disk.9
cvs rdiff -u -r1.51.2.2 -r1.51.2.3 src/sys/dev/dksubr.c
cvs rdiff -u -r1.103.4.1 -r1.103.4.2 src/sys/kern/subr_disk.c
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/sys/sys/dkio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/disk.9
diff -u src/share/man/man9/disk.9:1.36 src/share/man/man9/disk.9:1.36.24.1
--- src/share/man/man9/disk.9:1.36 Thu Dec 2 12:54:13 2010
+++ src/share/man/man9/disk.9 Mon Jun 1 19:19:44 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: disk.9,v 1.36 2010/12/02 12:54:13 wiz Exp $
+.\" $NetBSD: disk.9,v 1.36.24.1 2015/06/01 19:19:44 snj Exp $
.\"
.\" Copyright (c) 1995, 1996 Jason R. Thorpe.
.\" All rights reserved.
@@ -299,6 +299,10 @@ Get disk buffer queue strategy.
Set disk buffer queue strategy.
.It Dv DIOCGDISKINFO "struct plistref"
Get disk-info dictionary.
+.It Dv DIOCGMEDIASIZE "off_t"
+Get disk size in bytes.
+.It Dv DIOCGSECTORSIZE "u_int"
+Get sector size in bytes.
.El
.Sh USING THE FRAMEWORK
This section includes a description on basic use of the framework
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.51.2.2 src/sys/dev/dksubr.c:1.51.2.3
--- src/sys/dev/dksubr.c:1.51.2.2 Tue Nov 11 10:42:22 2014
+++ src/sys/dev/dksubr.c Mon Jun 1 19:19:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.51.2.2 2014/11/11 10:42:22 martin Exp $ */
+/* $NetBSD: dksubr.c,v 1.51.2.3 2015/06/01 19:19:44 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.51.2.2 2014/11/11 10:42:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.51.2.3 2015/06/01 19:19:44 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -291,10 +291,6 @@ dk_ioctl(struct dk_intf *di, struct dk_s
/* ensure that the pseudo-disk is initialized for these */
switch (cmd) {
-#ifdef DIOCGSECTORSIZE
- case DIOCGSECTORSIZE:
- case DIOCGMEDIASIZE:
-#endif
case DIOCGDINFO:
case DIOCSDINFO:
case DIOCWDINFO:
@@ -317,17 +313,6 @@ dk_ioctl(struct dk_intf *di, struct dk_s
}
switch (cmd) {
-#ifdef DIOCGSECTORSIZE
- case DIOCGSECTORSIZE:
- *(u_int *)data = dksc->sc_dkdev.dk_geom.dg_secsize;
- return 0;
- case DIOCGMEDIASIZE:
- *(off_t *)data =
- (off_t)dksc->sc_dkdev.dk_geom.dg_secsize *
- dksc->sc_dkdev.dk_geom.dg_nsectors;
- return 0;
-#endif
-
case DIOCGDINFO:
*(struct disklabel *)data = *(dksc->sc_dkdev.dk_label);
break;
Index: src/sys/kern/subr_disk.c
diff -u src/sys/kern/subr_disk.c:1.103.4.1 src/sys/kern/subr_disk.c:1.103.4.2
--- src/sys/kern/subr_disk.c:1.103.4.1 Tue May 19 04:53:02 2015
+++ src/sys/kern/subr_disk.c Mon Jun 1 19:19:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.103.4.1 2015/05/19 04:53:02 snj Exp $ */
+/* $NetBSD: subr_disk.c,v 1.103.4.2 2015/06/01 19:19:44 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.103.4.1 2015/05/19 04:53:02 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.103.4.2 2015/06/01 19:19:44 snj Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -510,7 +510,7 @@ int
disk_ioctl(struct disk *diskp, u_long cmd, void *data, int flag,
struct lwp *l)
{
- int error;
+ int error = 0;
switch (cmd) {
case DIOCGDISKINFO:
@@ -525,6 +525,15 @@ disk_ioctl(struct disk *diskp, u_long cm
break;
}
+ case DIOCGSECTORSIZE:
+ *(u_int *)data = diskp->dk_geom.dg_secsize;
+ break;
+
+ case DIOCGMEDIASIZE:
+ *(off_t *)data = (off_t)diskp->dk_geom.dg_secsize *
+ diskp->dk_geom.dg_secperunit;
+ break;
+
default:
error = EPASSTHROUGH;
}
Index: src/sys/sys/dkio.h
diff -u src/sys/sys/dkio.h:1.19.2.1 src/sys/sys/dkio.h:1.19.2.2
--- src/sys/sys/dkio.h:1.19.2.1 Tue Nov 11 10:36:41 2014
+++ src/sys/sys/dkio.h Mon Jun 1 19:19:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dkio.h,v 1.19.2.1 2014/11/11 10:36:41 martin Exp $ */
+/* $NetBSD: dkio.h,v 1.19.2.2 2015/06/01 19:19:44 snj Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@@ -115,4 +115,8 @@
/* trigger wedge auto discover */
#define DIOCMWEDGES _IOR('d', 131, int) /* make wedges */
+ /* query disk geometry */
+#define DIOCGSECTORSIZE _IOR('d', 133, u_int) /* sector size in bytes */
+#define DIOCGMEDIASIZE _IOR('d', 132, off_t) /* media size in bytes */
+
#endif /* _SYS_DKIO_H_ */
