Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No point wrapping the Ultrix disklabel stuff in COMPAT_ULTRIX

Browse Source
This commit is contained in:
ad 2008-11-15 11:19:07 +00:00
parent a471d58a44
commit ea8343610a
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/pmax/pmax/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.48 2008/01/02 11:48:27 ad Exp $ */
/* $NetBSD: disksubr.c,v 1.49 2008/11/15 11:19:07 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -32,9 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.48 2008/01/02 11:48:27 ad Exp $");
#include "opt_compat_ultrix.h"
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.49 2008/11/15 11:19:07 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -42,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.48 2008/01/02 11:48:27 ad Exp $");
#include <sys/disk.h>
#include <sys/disklabel.h>
#ifdef COMPAT_ULTRIX
#include <dev/dec/dec_boot.h>
#include <ufs/ufs/dinode.h> /* XXX for fs.h */
#include <ufs/ffs/fs.h> /* XXX for BBSIZE & SBSIZE */
@ -50,8 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.48 2008/01/02 11:48:27 ad Exp $");
const char *compat_label __P((dev_t dev, void (*strat) __P((struct buf *bp)),
struct disklabel *lp, struct cpu_disklabel *osdep)); /* XXX */
#endif
/*
* Attempt to read a disk label from a device
* using the indicated strategy routine.
@ -104,7 +99,6 @@ readdisklabel(dev, strat, lp, osdep)
}
}
brelse(bp, 0);
#ifdef COMPAT_ULTRIX
/*
* If no NetBSD label was found, check for an Ultrix label and
* construct tne incore label from the Ultrix partition information.
@ -116,12 +110,10 @@ readdisklabel(dev, strat, lp, osdep)
/* set geometry? */
}
}
#endif
/* XXX If no NetBSD label or Ultrix label found, generate default label here */
return (msg);
}
#ifdef COMPAT_ULTRIX
/*
* Given a buffer bp, try and interpret it as an Ultrix disk label,
* putting the partition info into a native NetBSD label
@ -200,8 +192,6 @@ done:
brelse(bp, 0);
return (msg);
}
#endif /* COMPAT_ULTRIX */
/*
* Check new disk label for sensibility