Deleted Added
full compact
subr_disk.c (94272) subr_disk.c (94287)
1/*
2 * ----------------------------------------------------------------------------
3 * "THE BEER-WARE LICENSE" (Revision 42):
4 * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you
5 * can do whatever you want with this stuff. If we meet some day, and you think
6 * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
7 * ----------------------------------------------------------------------------
8 *
1/*
2 * ----------------------------------------------------------------------------
3 * "THE BEER-WARE LICENSE" (Revision 42):
4 * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you
5 * can do whatever you want with this stuff. If we meet some day, and you think
6 * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
7 * ----------------------------------------------------------------------------
8 *
9 * $FreeBSD: head/sys/kern/subr_disk.c 94272 2002-04-09 10:04:09Z phk $
9 * $FreeBSD: head/sys/kern/subr_disk.c 94287 2002-04-09 15:43:32Z phk $
10 *
11 */
12
13#include "opt_geom.h"
14#ifndef GEOM
15
16#include <sys/param.h>
17#include <sys/systm.h>

--- 371 unchanged lines hidden (view full) ---

389 pdev = dkmodpart(dkmodslice(dev, WHOLE_DISK_SLICE), RAW_PART);
390 dp = pdev->si_disk;
391 if (!dp)
392 return (ENXIO);
393 if (cmd == DIOCSKERNELDUMP) {
394 u = *(u_int *)data;
395 return (diskdumpconf(u, dev, dp));
396 }
10 *
11 */
12
13#include "opt_geom.h"
14#ifndef GEOM
15
16#include <sys/param.h>
17#include <sys/systm.h>

--- 371 unchanged lines hidden (view full) ---

389 pdev = dkmodpart(dkmodslice(dev, WHOLE_DISK_SLICE), RAW_PART);
390 dp = pdev->si_disk;
391 if (!dp)
392 return (ENXIO);
393 if (cmd == DIOCSKERNELDUMP) {
394 u = *(u_int *)data;
395 return (diskdumpconf(u, dev, dp));
396 }
397 if (cmd == DIOCGFRONTSTUFF) {
398 *(off_t *)data = 8192; /* XXX: crude but enough) */
399 return (0);
400 }
397 error = dsioctl(dev, cmd, data, fflag, &dp->d_slice);
398 if (error == ENOIOCTL)
399 error = dp->d_devsw->d_ioctl(dev, cmd, data, fflag, td);
400 return (error);
401}
402
403static int
404diskpsize(dev_t dev)

--- 26 unchanged lines hidden ---
401 error = dsioctl(dev, cmd, data, fflag, &dp->d_slice);
402 if (error == ENOIOCTL)
403 error = dp->d_devsw->d_ioctl(dev, cmd, data, fflag, td);
404 return (error);
405}
406
407static int
408diskpsize(dev_t dev)

--- 26 unchanged lines hidden ---