Deleted Added
full compact
geom_disk.c (110708) geom_disk.c (110710)
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 110708 2003-02-11 14:12:06Z phk $
35 * $FreeBSD: head/sys/geom/geom_disk.c 110710 2003-02-11 14:57:34Z phk $
36 */
37
38#include "opt_geom.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/sysctl.h>

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

285 gp->softc = dp;
286 gp->dumpconf = g_disk_dumpconf;
287 dp->d_geom = gp;
288 pp = g_new_providerf(gp, "%s", gp->name);
289 pp->mediasize = dp->d_mediasize;
290 pp->sectorsize = dp->d_sectorsize;
291 if (dp->d_flags & DISKFLAG_CANDELETE)
292 pp->flags |= G_PF_CANDELETE;
36 */
37
38#include "opt_geom.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/sysctl.h>

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

285 gp->softc = dp;
286 gp->dumpconf = g_disk_dumpconf;
287 dp->d_geom = gp;
288 pp = g_new_providerf(gp, "%s", gp->name);
289 pp->mediasize = dp->d_mediasize;
290 pp->sectorsize = dp->d_sectorsize;
291 if (dp->d_flags & DISKFLAG_CANDELETE)
292 pp->flags |= G_PF_CANDELETE;
293 pp->stripeoffset = dp->d_stripeoffset;
294 pp->stripesize = dp->d_stripesize;
293 g_error_provider(pp, 0);
294 if (bootverbose)
295 printf("GEOM: new disk %s\n", gp->name);
296}
297
298
299
300dev_t

--- 82 unchanged lines hidden ---
295 g_error_provider(pp, 0);
296 if (bootverbose)
297 printf("GEOM: new disk %s\n", gp->name);
298}
299
300
301
302dev_t

--- 82 unchanged lines hidden ---