 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_disk.c,v 1.93.10.2 2010/11/21 21:48:28 riz Exp $	*/
+/*	$NetBSD: subr_disk.c,v 1.93.10.3 2011/01/07 06:33:45 riz Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1999, 2000, 2009 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
 @@ -57,36 +57,39 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.93.10.2 2010/11/21 21:48:28 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.93.10.3 2011/01/07 06:33:45 riz Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/syslog.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/sysctl.h>
 #include <sys/fcntl.h>
 #include <sys/kauth.h>
 #include <sys/vnode_if.h>
 #include <lib/libkern/libkern.h>
 /*
  * Compute checksum for disk label.
  */
 u_int
 dkcksum(struct disklabel *lp)
+{
 	return dkcksum_sized(lp, lp->d_npartitions);
+}
 u_int
 dkcksum_sized(struct disklabel *lp, size_t npartitions)
 @@ -483,13 +486,41 @@ disk_ioctl(struct disk *diskp, u_long cm
 			error = ENOTSUP;
 		else
 			error = prop_dictionary_copyout_ioctl(pref, cmd,
 							diskp->dk_info);
 		break;
+	    }
 	default:
 		error = EPASSTHROUGH;
+	}
 	return (error);
+}
 int
 getdisksize(struct vnode *vp, uint64_t *numsecp, unsigned *secsizep)
+{
 	struct partinfo dpart;
 	struct dkwedge_info dkw;
 	struct disk *pdk;
 	int error;
 	error = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, NOCRED);
 	if (error == 0) {
 		*secsizep = dpart.disklab->d_secsize;
 		*numsecp  = dpart.part->p_size;
 		return 0;
+	}
 	error = VOP_IOCTL(vp, DIOCGWEDGEINFO, &dkw, FREAD, NOCRED);
 	if (error == 0) {
 		pdk = disk_find(dkw.dkw_parent);
 		if (pdk != NULL) {
 			*secsizep = DEV_BSIZE << pdk->dk_blkshift;
 			*numsecp  = dkw.dkw_size;
 		} else
 			error = ENODEV;
+	}
 	return error;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: device.h,v 1.112.6.1 2009/03/15 19:43:48 snj Exp $ */
+/* $NetBSD: device.h,v 1.112.6.2 2011/01/07 06:33:44 riz Exp $ */
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -379,26 +379,27 @@ struct pdevinit {
 /* This allows us to wildcard a device unit. */
 #define	DVUNIT_ANY	-1
 #ifdef _KERNEL
 extern struct cfdriverlist allcfdrivers;/* list of all cfdrivers */
 extern struct devicelist alldevs;	/* list of all devices */
 extern struct cftablelist allcftables;	/* list of all cfdata tables */
 extern device_t booted_device;		/* the device we booted from */
 extern device_t booted_wedge;		/* the wedge on that device */
 extern int booted_partition;		/* or the partition on that device */
 struct vnode *opendisk(struct device *);
 int getdisksize(struct vnode *, uint64_t *, unsigned *);
 int config_handle_wedges(struct device *, int);
 void	config_init(void);
 void	drvctl_init(void);
 void	configure(void);
 void	configure2(void);
 int	config_cfdriver_attach(struct cfdriver *);
 int	config_cfdriver_detach(struct cfdriver *);
 int	config_cfattach_attach(const char *, struct cfattach *);
 int	config_cfattach_detach(const char *, struct cfattach *);