| geom_disk.c (106101) | geom_disk.c (107953) |
|---|---|
| 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 18 unchanged lines hidden (view full) --- 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * | 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 18 unchanged lines hidden (view full) --- 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * |
| 35 * $FreeBSD: head/sys/geom/geom_disk.c 106101 2002-10-28 22:43:54Z phk $ | 35 * $FreeBSD: head/sys/geom/geom_disk.c 107953 2002-12-16 22:33:27Z phk $ |
| 36 */ 37 38#include "opt_geom.h" 39#ifndef NO_GEOM 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> --- 154 unchanged lines hidden (view full) --- 198 break; 199 } 200 if (error != EJUSTRETURN) 201 g_io_deliver(bp, error); 202 return; 203} 204 205static void | 36 */ 37 38#include "opt_geom.h" 39#ifndef NO_GEOM 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> --- 154 unchanged lines hidden (view full) --- 198 break; 199 } 200 if (error != EJUSTRETURN) 201 g_io_deliver(bp, error); 202 return; 203} 204 205static void |
| 206g_disk_dumpconf(struct sbuf *sb, char *indent, struct g_geom *gp, struct g_consumer *cp, struct g_provider *pp) | 206g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_consumer *cp, struct g_provider *pp) |
| 207{ 208 struct disk *dp; 209 210 dp = gp->softc; 211 if (indent == NULL) { 212 sbuf_printf(sb, " hd %u", dp->d_fwheads); 213 sbuf_printf(sb, " sc %u", dp->d_fwsectors); 214 return; --- 116 unchanged lines hidden --- | 207{ 208 struct disk *dp; 209 210 dp = gp->softc; 211 if (indent == NULL) { 212 sbuf_printf(sb, " hd %u", dp->d_fwheads); 213 sbuf_printf(sb, " sc %u", dp->d_fwsectors); 214 return; --- 116 unchanged lines hidden --- |