Module Name: src
Committed By: mlelstv
Date: Mon Dec 29 18:41:20 UTC 2014
Modified Files:
src/share/man/man9: disk.9
src/sys/dev: dksubr.c
src/sys/kern: subr_disk.c
src/sys/sys: dkio.h
Log Message:
Implement DIOCGMEDIASIZE and DIOCGSECTORSIZE from FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/share/man/man9/disk.9
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/dksubr.c
cvs rdiff -u -r1.103 -r1.104 src/sys/kern/subr_disk.c
cvs rdiff -u -r1.20 -r1.21 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.37
--- src/share/man/man9/disk.9:1.36 Thu Dec 2 12:54:13 2010
+++ src/share/man/man9/disk.9 Mon Dec 29 18:41:20 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: disk.9,v 1.36 2010/12/02 12:54:13 wiz Exp $
+.\" $NetBSD: disk.9,v 1.37 2014/12/29 18:41:20 mlelstv 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.55 src/sys/dev/dksubr.c:1.56
--- src/sys/dev/dksubr.c:1.55 Mon Dec 29 12:03:39 2014
+++ src/sys/dev/dksubr.c Mon Dec 29 18:41:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.55 2014/12/29 12:03:39 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.56 2014/12/29 18:41:20 mlelstv 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.55 2014/12/29 12:03:39 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.56 2014/12/29 18:41:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -311,10 +311,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:
@@ -337,17 +333,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 src/sys/kern/subr_disk.c:1.104
--- src/sys/kern/subr_disk.c:1.103 Sat Oct 19 22:36:57 2013
+++ src/sys/kern/subr_disk.c Mon Dec 29 18:41:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.103 2013/10/19 22:36:57 mlelstv Exp $ */
+/* $NetBSD: subr_disk.c,v 1.104 2014/12/29 18:41:20 mlelstv 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 2013/10/19 22:36:57 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.104 2014/12/29 18:41:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -502,6 +502,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.20 src/sys/sys/dkio.h:1.21
--- src/sys/sys/dkio.h:1.20 Tue Nov 4 07:41:37 2014
+++ src/sys/sys/dkio.h Mon Dec 29 18:41:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dkio.h,v 1.20 2014/11/04 07:41:37 mlelstv Exp $ */
+/* $NetBSD: dkio.h,v 1.21 2014/12/29 18:41:20 mlelstv 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_ */
