Revert r330897:

This was intended to be a non-functional change. It wasn't. The commit
message was thus wrong. In addition it broke arm, and merged crypto
related code.

Revert with prejudice.

This revert skips files touched in r316370 since that commit was since
MFCed. This revert also skips files that require $FreeBSD$ property
changes.

Thank you to those who helped me get out of this mess including but not
limited to gonzo, kevans, rgrimes.

Requested by: gjb (re)

Partial merge of the SPDX changes

These changes are incomplete but are making it difficult
to determine what other changes can/should be merged.

No objections from: pfg

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Remove old ioctl use and support, once and for all.

Remove ia64.

This includes:
o All directories named *ia64*
o All files named *ia64*
o All ia64-specific code guarded by __ia64__
o All ia64-specific makefile logic
o Mention of ia64 in comments and documentation

This excludes:
o Everything under contrib/
o Everything under crypto/
o sys/xen/interface
o sys/sys/elf_common.h

Discussed at: BSDcan

Add DragonFlyBSD's Hammer FS types and type names.

MFC after: 2 weeks

Add a partition type for nandfs to the apm, bsd, gpt and vtoc8 schemes.
The gpart alias for these partition types is "freebsd-nandfs".

Add MIPS platform, this will make bsdlabel(8) work on MIPS (when invoked
without a -m option. -m mips is still not supported)

Initial storage functionality for U-Boot support library.

- Only non-sliced bsdlabel style partitioning is currently supported (but provisions
are made towards GPT support, which should follow soon)
- Enable storage support in loader on ARM

Obtained from: Semihalf

Add missing comma.

PR: bin/121645
Submitted by: OISHI Masakuni <yamasa at bsdhouse dot org>
Approved by: imp (mentor, implicit for trivial changes)
MFC after: 3 days

Add a file system type for ZFS (FS_ZFS).

Sync with NetBSD rev 1.101.
This also fixes fstypenames being short an entry.

Remove various bits of conditional Alpha code and fixup a few comments.

Treat arm as i386.

/* -> /*- for license, minor formatting changes

Remove advertising clause from University of California Regent's license,
per letter dated July 22, 1999.

Approved by: core

Sanitize the LABELSECTOR & LABELOFFSET definitions:
Remove sparc64 definitions.
Remove fallback definitions.

Gah! Set LABELSECTOR and LABELOFFSET correctly for amd64. This might
explain why I've been having trouble with libdisk and sysinstall...

Make bsd_disklabel_le_enc calculate the checksum and fill it in.
(If there is a legitimate need to correctly encode and pack a
disklabel with an invalid checksum custom tools can be built for
that.)

Make bsd_disklabel_le_dec() validate the magics, number of partitions
(against a new parameter) and the checksum.

Vastly simplify the logic of the GEOM::BSD class implementation:

Let g_bsd_modify() always take a byte-stream label.

This simplifies all users, except the ioctl's which now have to
convert to a byte-stream first. Their loss.

g_bsd_modify() is called with topology held now, and it returns
with it held.

Always update the md5sum in g_bsd_modify(), otherwise the check
is no use after the first modification of the label. Make the
MD5 over the bytestream version of the label.

Move the rawoffset hack to g_bsd_modify() and remove all the
inram/ondisk conversions.

Don't configure hotspots in g_bsd_modify(), do it in taste instead,
we do not support moving the label to a different location on the
fly anyway.

This passes all current regression tests.

Separate the encoding/decoding functions for struct disklabel into a
separate source file which can be used from both kernel and userland code.

NO_GEOM cleanup: Remove dkmakeminor().

NO_GEOM cleanup: unifdef

Add ioctl which overwrites the first BBSIZE bytes of a BSD labeled disk.

Put DIOCWLABEL under #ifdef NO_GEOM

#ifdef NO_GEOM some bits here too.

After much delay and anticipation, welcome RAIDFrame into the FreeBSD
world. This should be considered highly experimental.

Approved-by: re

Correctly account for MAXPARTITIONS in the CTASSERT() which protects the
size of the disklabel structure.

Hit by: schweikh

Correct the offset of the 'jfs' entry in fstypenames.

Divorce bsd disklabels, IBM PC MBR's and whatever the things are
called on NEC PC98 machines.

Sponsored by: DARPA & NAI Labs.

Make FreeBSD "struct disklabel" agnostic, step 312 of 723:

Rename bioqdisksort() to bioq_disksort().
Keep a #define around to avoid changing all diskdrivers right now.

Move it from subr_disklabel.c to subr_disk.c.
Move prototype from <sys/disklabel.h> to <sys/bio.h>

Sponsored by: DARPA and NAI Labs.

Make FreeBSD "struct disklabel" agnostic, step 311 of 723:

Rename diskerr() to disk_err() for naming consistency.

Drop the by now entirely useless struct disklabel argument.

Add a flag argument for new-line termination.

Fix a couple of printf-format-casts to %j instead of %l.

Correctly print the name of all bio commands.

Move the function from subr_disklabel.c to subr_disk.c,
and from <sys/disklabel.h> to <sys/disk.h>.

Use the new disk_err() throughout, #include <sys/disk.h> as needed.

Bump __FreeBSD_version for the sake of the aac disk drivers #ifdefs.

Remove unused disklabel members of softc for aac, amr and mlx, which seem
to originally have been intended for diskerr() use, but which only rotted
and got Copy&Pasted at least two times to many.

Sponsored by: DARPA & NAI Labs.

Retire now unused DIOCGDVIRGIN kludge.

Sponsored by: DARPA & NAI Labs.

Deal with a new exteded MBR paritition type

Submitted by: Michal Mertl <mime@traveller.cz>

forgot to actually commit the DK/FS TYPES split, do it now.

Remove the compat bits for the mis-aligned struct disklabel on alpha,
people got three times longer than I promised.

Sponsored by: DARPA & NAI Labs.

More s/file system/filesystem/g

ARGH! SBLOCK is not unused. Try to get this right.

BBSIZE belongs in <sys/disklabel.h> (but shouldn't be a constant).

Define SBLOCK again, using the right math.

Sponsored by: DARPA & NAI Labs.

De-K&R dkcksum() to fix some issues with c++.

Submitted by: Miguel Mendez <flynn@energyhq.homeip.net>

Move generic disk ioctls from <sys/disklabel.h> to <sys/disk.h>.

Sponsored by: DARPA & NAI Labs

In reverence of the 3rd X11 development rule:

3.The only thing worse than generalizing from one example
is generalizing from no examples at all.

Remove the fwcylinders attribute before anybody gets the idea that we
alone have squared the circle.

Sponsored by: DARPA & NAI Labs.

Constify.

Sponsored by: DARPA & NAI Labs.

Delete the bogus d_boot[01] fields from struct disklabel.

This shrinks the size 4 bytes on alpha, down to the same 276 bytes
as all other platforms.

Construct a hack to make old ioctls work on new kernels.

Once world is recompiled only the new and correct sysctls will be
used.

This hack will become annoying around 1st of may to make people
rebuild their worlds and it will be gone before 5.0.

CTASSERT the size of struct dos_partition.

Retire the bogus ioctl DIOCGPART in toto.

Once again we can notice that badly thought out hacks ferment and infect
far more code than initially expected.

Sponsored by: DARPA and NAI Labs.

Really sweep the broom on this one.

It's amazing how much cruft accumulate over the years...

Remove various controller/disk type hacks for SMD, ST506 and ancient
SCSI stuff which have far outlived its sell by date.

Here follows the new kernel dumping infrastructure.

Caveats:

The new savecore program is not complete in the sense that it emulates
enough of the old savecores features to do the job, but implements none
of the options yet.

I would appreciate if a userland hacker could help me out getting savecore
to do what we want it to do from a users point of view, compression,
email-notification, space reservation etc etc. (send me email if
you are interested).

Currently, savecore will scan all devices marked as "swap" or "dump" in
/etc/fstab _or_ any devices specified on the command-line.

All architectures but i386 lack an implementation of dumpsys(), but
looking at the i386 version it should be trivial for anybody familiar
with the platform(s) to provide this function.

Documentation is quite sparse at this time, more to come.

Details:

ATA and SCSI drivers should work as the dump formatting code has been
removed. The IDA, TWE and AAC have not yet been converted.

Dumpon now opens the device and uses ioctl(DIOCGKERNELDUMP) to set
the device as dumpdev. To implement the "off" argument, /dev/null
is used as the device.

Savecore will fail if handed any options since they are not (yet)
implemented. All devices marked "dump" or "swap" in /etc/fstab
will be scanned and dumps found will be saved to diskfiles
named from the MD5 hash of the header record. The header record
is dumped in readable format in the .info file. The kernel
is not saved. Only complete dumps will be saved.

All maintainer rights for this code are disclaimed: feel free to
improve and extend.

Sponsored by: DARPA, NAI Labs

Add d_type and fstype names for JFS.

Requested by: Hiten Pandya <hiten@uk.FreeBSD.org>

Revert last commit, it came too late to save alpha :-(

Hide the ugly d_boot[01] from the kernel.

Fixed some style bugs in the removal of __P(()). The main ones were
not removing tabs before "__P((", and not outdenting continuation lines
to preserve non-KNF lining up of code with parentheses. Switch to KNF
formatting and/or rewrap the whole prototype in some cases.

Remove __P

Add five GEOM oriented ioctls to get basic information about a geom device.

LABELOFFSET is 128 for sparc64.

Submitted by: tmm
Forgotten by: obrien

Hide the DIOCGPART ioctl from userland where it has no decent use.

It's use in the kernel is also highly suspect due to the total absense
of any kind of lifetime definition of the passed pointers.

Uninlined most of the bloated inline functions in <sys/disklabel.h>. Some
of them need to become even larger to support devfs.

Garbage-collect vestiges of disksort(). We now have only one disksort()
again, but its name has regressed to bioqdisksort().

Fixed some style bugs

Rename the top 7 bits if disk minors to spare bits, rather than type bits.

Put the label at the same place as i386 for compatibility.

Re-apply rev 1.178 -- style(9) the structure definitions.
I have to wonder how many other changes were lost in the KSE mildstone 2 merge.

Use ANSI prototype and function definition for dkcksum so that this
file can be included with C++ again. This appears to have been broken
in 1.54 with the introduction of it as an inline function.

Make a #define for the highest legal disk unit (0x1ff)

Make diskerr() always log with printf.

Add a new ioctl for doing virgin disklabels.

Submitted by: dillon

GC some LFS lint.

Add proper prototype for dkcksum();

Turn dkcksum() into an __inline function.

Change its type to u_int_16_t.

Define more DOSPTYP_* constants for different filesystem types

Reminded by: ps

Retire bufqdisksort(), all drivers use bioqdisksort now.

Complete the bio/buf divorce for all code below devfs::strategy

Exceptions:
Vinum untouched. This means that it cannot be compiled.
Greg Lehey is on the case.

CCD not converted yet, casts to struct buf (still safe)

atapi-cd casts to struct buf to examine B_PHYS

Clone bio versions of certain bits of infrastructure:
devstat_end_transaction_bio()
bioq_* versions of bufq_* incl bioqdisksort()
the corresponding "buf" versions will disappear when no longer used.

Move b_offset, b_data and b_bcount to struct bio.

Add BIO_FORMAT as a hack for fd.c etc.

We are now largely ready to start converting drivers to use struct
bio instead of struct buf.

Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL"
is an application space macro and the applications are supposed to be free
to use it as they please (but cannot). This is consistant with the other
BSD's who made this change quite some time ago. More commits to come.

Remove BAD144 support, it has already been disabled for some time.

Fixed breakage of userland K&R support in rev.1.39. Kernel inline functions
with new-style function definitions were exported.

Oops, I forgot to commit this together with the updates to the callers.

Removed diskerr()'s unused d_name arg and updated callers. This fixes
warnings caused by the arg having the wrong type (not const enough).
The arg was also wrong (a full name instead of a short one) for calls
from from subr_diskmbr.c and pc98/diskslice_machdep.c.

Try to win back the "removal of most crufty code" trophy from markm:

Remove WD formatting code which has never worked in 386bsd or FreeBSD.

Remove DIOCSSTEP and DIOCSRETRIES ioctls as well, they belong in
history, along with the SMD disks.

OK'ed by: bde

Merge alpha and pc98 changes into i386 MBR handling code and replace all
three copies with one copy in MI land.

$Id$ -> $FreeBSD$

Spring cleaning around strategy and disklabels/slices:

Introduce BUF_STRATEGY(struct buf *, int flag) macro, and use it throughout.
please see comment in sys/conf.h about the flag argument.

Remove strategy argument from all the diskslice/label/bad144
implementations, it should be found from the dev_t.

Remove bogus and unused strategy1 routines.

Remove open/close arguments from dssize(). Pick them up from dev_t.

Remove unused and unfinished setgeom support from diskslice/label/bad144 code.

mfs: DOC2K label type for legacy labels

Prototype for alpha_fix_srm_checksum().

Fix some of the places where too much inside knowledge about major/minor
layout and dev_t structure is being (ab)used.

Fixed some style bugs (mainly vinum ones and ones fixed in Lite2 but
not here).

Add partition type for Vinum.

Offered-for-inspection-to: jkh

catch a /boot doc instance I missed.

Remove a useless ifdef which made struct disklabel have a different
size in kernel and user builds on the alpha and prevented various ioctls
from working.

Point at the correct disk location for alpha disklabels.

Don't assume that longs are 32 bits in struct dos_partition.

This commit fixes various 64bit portability problems required for
FreeBSD/alpha. The most significant item is to change the command
argument to ioctl functions from int to u_long. This change brings us
inline with various other BSD versions. Driver writers may like to
use (__FreeBSD_version == 300003) to detect this change.

The prototype FreeBSD/alpha machdep will follow in a couple of days
time.

The changes I had made long ago to support >32 disk-type units was
incomplete; dkmakeminor was broken for >32. I noticed this when trying
to use more than 32 ccd units on wcarchive.
Reviewed by: bde

Reserve ID for Greg Lehey's Veritas look-alike.

Forward declare more structs that are used in prototypes here - don't
depend on <sys/types.h> forward declaring common ones.

buf.h:
Change the definition of a buffer queue so that bufqdisksort can
properly deal with bordered writes.

Add inline functions for accessing buffer queues. This should be
considered an opaque data structure by clients.

callout.h:
New callout implementation.

device.h:
Add support for CAM interrupts.

disk.h:
disklabel.h:
tqdisksort->bufqdisksort

kernel.h:
Add new configuration entries for configuration hooks and calling
cpu_rootconf and cpu_dumpconf.

param.h:
Add a priority for sleeping waiting on config hooks.

proc.h:
Update for new callout implementation.

queue.h:
Add TAILQ_HEAD_INITIALIZER from NetBSD.

systm.h:
Add prototypes for cpu_root/dumpconf, splcam, splsoftcam, etc..

Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not
ready for it yet.

Changed dkunit() to use some previously unused bits in the 'type' field
to extend the unit field to 9 bits (512 units).

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Cleaned up all headers that include <sys/ioctl.h> or <sys/ioccom.h>:
- don't include <sys/ioctl.h> in any header. Include <sys/ioccom.h>
instead. This was already done in 4.4Lite for the most important
ioctl headers. Header spam currently increases kernel build
times by 10-20%. There are more than 30000 #includes (not counting
duplicates) for compiling LINT.
- include <sys/types.h> if and only it is necessary to make the header
almost self-sufficient (some ioctl headers still need structs from
elsewhere).
- uniformized idempotency ifdefs. Copied the style in the 4.4Lite
ioctl headers.

Don't include <sys/conf.h> for the kernel in disk-related headers.
It is needed for implementation details but very little of it is
needed for the interface. Include it in the few places that didn't
already include it.

Include <sys/ioccom.h> in <sys/disklabel.h> (as already in
<sys/diskslice.h>) so that all the disk-related headers are almost
self-sufficient.

The Great PC98 Merge.

All new code is "#ifdef PC98"ed so this should make no difference to
PC/AT (and its clones) users.

Ok'd by: core
Submitted by: FreeBSD(98) development team

Bring in ccd support.

New disk type for ccd.

Merge in Lite2: use fixed-width types and reformat comments.
Reviewed by: davidg & bde

Oops, the previous change was missing the declaration of `struct
buf_queue_head'. It isn't forward declared in <sys/types.h> like
`struct buf'.

Declared tqdisksort(). <sys/disklabel.h> is the wrong place, but
<sys.disk.h> isn't used, so the declaration there isn't seen.

Remove transitory labelling code. Labels are now handled by essentially
the original 4.4lite code. Machine Specific Partitions are now handled
separately.

Remove trailing whitespace.

Changes to support the "new" bad144. Adds a "BADSCAN" ioctl and support.

Reviewed by: Bruce Evans
Submitted by: Poul-Henning Kamp

Removed extraneous comma.

Reviewed by: Bruce Evans

making a reservation for more bits before people start using them
in the minor number, (this stuff HAS to go!)
The change I want is:
/*
3 2 1 0
1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
_________________________________________________________________
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
-----------------------------------------------------------------
| TYPE | SLICE | MAJOR? | UNIT |PART | <-now
-----------------------------------------------------------------
| TYPE |PART2| SLICE | MAJOR? | UNIT |PART | <-soon
-----------------------------------------------------------------

I want 3 more part bits (taken from 'TYPE' (useless as it is) (JRE)
*/

Remove bogus unused `struct cpu_disklabel'.

Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
(except in netccitt, netiso and netns) and most of the warnings from
`gcc -Wnested-externs'. Fix all the bugs found. There were no serious
ones.

Add a prototype.

disklabel.h:
Prepare for disk slices - more macros for handling disk device numbers,
version of readdisklabel() without DOS goop.
Clean up prototypes.
Uniformize idempotency ifdef.

diskslice.h:
New file.

dkbad.h:
Define more magic numbers.
Declare internalized version of dkbad struct and functions to operate on it.
Uniformize idempotency ifdef.

Declare `struct dkbad' with the correct scope so that everything including
<sys/disklabel.h> doesn't have to include <sys/dkbad.h> to avoid compiler
warnings.

changed '#ifdef i386' to '#ifdef __i386__'

Julian Elischer's disklabel fixes.

Added
#define MBR_PTYPE_FreeBSD 0xa5 /* FreeBSD partition type */


Reviewed by:
Submitted by:
Obtained from:

Made them all idempotent.
Reviewed by:
Submitted by:

Added $Id$

The big 4.4BSD Lite to FreeBSD 2.0.0 (Development) patch.

Reviewed by: Rodney W. Grimes
Submitted by: John Dyson and David Greenman

This commit was generated by cvs2svn to compensate for changes in r1541,
which included commits to RCS files with non-trunk default branches.

BSD 4.4 Lite Kernel Sources