CVS log for src/sys/sys/disklabel.h

Up to [cvs.NetBSD.org] / src / sys / sys

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Add exFAT partition type.

s/Unfornately/Unfortunately/ in comment.

Define the mount program for zfs.

disk(9): New function disklabel_dev_unit.

Maps a dev_t like wd3e to an autoconf instance number like 3, with no
partition.  Same as DISKUNIT macro, but is a symbol whose pointer can
be taken.  Meant for use with struct bdevsw, cdevsw::d_devtounit.

Sync w/ HEAD.

sync with head

move bi-endian disklabel support from the kernel and libsa into libkern.

- dkcksum() and dkcksum_sized() move from subr_disk.c and from
  libsa into libkern/dkcksum.c (which is missing _sized() version),
  using the version from usr.sbin/disklabel.

- swap_disklabel() moves from subr_disk_mbr.c into libkern, now called
  disklabel_swap().  (the sh3 version should be updated to use this.)

- DISKLABEL_EI becomes a first-class option with opt_disklabel.h.

- add libkern.h to libsa/disklabel.c.

this enables future work for bi-endian libsa/ufs.c (relevant for ffsv1,
ffsv2, lfsv1, and lfsv2), as well as making it possible for ports not
using subr_disk_mbr.c to include bi-endian disklabel support (which,
afaict, includes any disk on mbr-supporting platforms that do not have
an mbr as well as disklabel.)

builds successsfully on: alpha, i386, amd64, sun2, sun3, evbarm64,
evbarm64-eb, sparc, and sparc64.  tested in anita on i386 and sparc,
testing in hardware on evbarm64*.

Mostly merge changes from HEAD upto 20200411

Merge changes from current as of 20200406

Match indentation of previous entries.

Now that we have a partition type for it, also add FS_ZFS.

Fix a typo is christos long comment.  :)

Add a rather long comment explaining what has happened with disklabel and
why.

Sync with HEAD

Sync with HEAD, resolve a couple of conflicts

add support to detect the 3 vmware GPT partition types:

- VMKcore (dump partition)
- VMFS
- VMware reserved

this enables vmkcore partitions for netbsd swap or dump, as well
as naming all of them.

update from HEAD

Sync with HEAD (as of 26th Dec)

Replace DIOCGPART -> DIOCGPARTINFO which returns the data needed instead of
pointers.

Sync with HEAD

We have three sets of DTYPE_ constants in the kernel:
	altq		Drop 		Type
	disklabel	Disk 		Type
	file		Descriptor	Type
(not to mention constants that contain the string DTYPE).
Let's make them two, by changing the disklabel one to be DisK TYPE since the
other disklabel constants seem to do that. Not many userland programs use
these constants (and the ones that they do are mostly in ifdefs). They will
be fixed shortly.

Don't nest structure definitions.

Rebase to HEAD as of a few days ago.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

sync with head

Fix typo in comment.

resync from head

Pull up following revision(s) (requested by martin in ticket #1856):
	sys/arch/vax/boot/xxboot/start.S: revision 1.5
	sys/sys/bootblock.h: revision 1.55
	sys/sys/disklabel.h: revision 1.113
	usr.sbin/installboot/arch/vax.c: revision 1.14-1.15
Rearrange primary bootstrap slightly to free up all space between the disk
label and the uVAX rom boot parameter block.
Calculate the disklabel size (for asm code) dynamically based on MAXPARTITIONS.
Adapt to new vax primary bootstrap layout.
Fix installboot for VAX, as discussed on port-vax. Problem pointed out
by Jonny Billquist, thanks to Marl Pizzolato for patiently explaining
the various ways of booting a vax to me.
Now VAX 780 can boot directly from VMB.EXE again.
Provide an empty __CTASSERT() for toolbuilds

If used in a tool, undef MAXPARTITIONS and redefine as MAXMAXPARTITIONS

Make disklabel a MI tool.  It will use MACHINE/MACHINE_ARCH to determine
the disklabel params as well as allowing command-line options of -M <machine>
and -B {le,be} to specify MACHINE and byteorder to be used.

Pull up following revision(s) (requested by martin in ticket #865):
	sys/arch/vax/include/disklabel.h: revision 1.7
	sys/arch/vax/boot/xxboot/start.S: revision 1.5
	sys/sys/bootblock.h: revision 1.55
	sys/sys/disklabel.h: revision 1.113
	usr.sbin/installboot/arch/vax.c: revision 1.14
	usr.sbin/installboot/arch/vax.c: revision 1.15
	sys/kern/sys_generic.c: revision 1.129
Revert VAX MAXPARTITION bump to 16, adjusting it to 12 instead. Fix bootblocks
and installboot for VAX 780 and other machines booting via VMB.EXE.

Calculate the disklabel size (for asm code) dynamically based on
MAXPARTITIONS.

sync with head

merge to -current.

PR/45796: Evgeniy Ivanov minixfs3 support.

s/info/name

Sync the disklabel fstype info with the wedge partition info.
From now on these will stay synchronized because if they don't
getfstypeinfo will not compile.

7th Edition(V7) File System support. and NetBSD symbolic-link, socket, FIFO extension. see newfs_v7fs(8).

Sync with HEAD.

sync with head

Make struct disklabel 8 byte aligned.  This increases its size by 4 bytes
on IPL32 platforms so add code in sys_ioctl (and netbsd32_ioctl) to deal
with the older/smaller diskabel size.  This change makes disklabel the
same for both IPL32 and LP64 platforms.

Add a uint64_t to the union so that disklabel will have the same layout on
both LP64 and IPL32.

sync with head

Limit DIOCGPART and struct partinfo visibility to _KERNEL.

Give rump virtual disks their own type.

sync with head.

Sync with HEAD.

Import read-only part of the NiLFS (v2) implementation for NetBSD. It has been
tested with a DEBUG+DIAGNOSTIC+LOCKDEBUG kernel. To summerise NiLFS, i'll
repeat my posting to tech-kern here:

NiLFS stands for New implementation of Logging File System; LFS done
right they claim :) It is at version 2 now and is being developed by NTT, the
Japanese telecom company and recently put into the linux source tree. See
http://www.nilfs.org. The on-disc format is not completely frozen and i expect
at least one minor revision to come in time.

The benefits of NiLFS are build-in fine-grained checkpointing, persistent
snapshots, multiple mounts and very large file and media support. Every
checkpoint can be transformed into a snapshot and v.v. It is said to perform
very well on flash media since it is not overwriting pieces apart from a
incidental update of the superblock, but that might change. It is accompanied
by a cleaner to clean up the segments and recover lost space.

My work is not a port of the linux code; its a new implementation. Porting the
code would be more work since its very linux oriented and never written to be
ported outside linux. The goal is to be fully interchangable. The code is non
intrusive to other parts of the kernel. It is also very light-weight.

The current state of the code is read-only access to both clean and dirty
NiLFS partitions. On mounting a dirty partition it rolls forward the log to
the last checkpoint. Full read-write support is however planned!

Just as the linux code, mount_nilfs allows for the `head' to be mounted
read/write and allows multiple read-only snapshots/checkpoint mounts next to
it.

By allowing the RW mount at a different snapshot for read-write it should be
possible eventually to revert back to a previous state; i.e. try to upgrade a
system and being able to revert to the exact state prior to the upgrade.

Compared to other FS's its pretty light-weight, suitable for embedded use and
on flash media. The read-only code is currently 17kb object code on
NetBSD/i386. I doubt the read-write code will surpass the 50 or 60. Compared
this to FFS being 156kb, UDF being 84 kb and NFS being 130kb. Run-time memory
usage is most likely not very different from other uses though maybe a bit
higher than FFS.

sync with head.

Pretty print comment adaptions for UDF and EFS so they line up nicely again.

sync with head.

Sync with HEAD.

Sync with HEAD.

Add ISO partition detection enabling auto-detection of iso9660 and UDF
partitions on optical media like CD/DVD/BD but also on all other media if
there is no NetBSD disklabel or MBR label.

Also fix cd's readdisklabel arguments so the ioctl's arrive at the right
device (!) and update its default label to make more sense.

Sync with HEAD.

Sync with HEAD.

Sync with wrstuden-revivesa-base-2.

I forgot to commit this file. Add definition of DM disklabel type.

sync with head.

Sync with head.

Sync with head.

Add read-only support for SGI's Extent File System.

Reviewed by pooka@.

Extract common code from i386, xen, and sparc64, creating
config_handle_wedges() and read_disk_sectors().  On x86, handle_wedges()
is a thin wrapper for config_handle_wedges().  Share opendisk()
across architectures.

Add kernel code in support of specifying a root partition by wedge
name.  E.g., root specifications "wedge:wd0a", "wedge:David's Root
Volume" are possible.  (Patches for config(1) coming soon.)

In support of moving disks between architectures (esp. i386 <->
evbmips), I've written a routine convertdisklabel() that ensures
that the raw partition is at RAW_DISK by following these steps:

        0 If we have read a disklabel that has a RAW_PART with
          p_offset == 0 and p_size != 0, then use that raw partition.

        1 If we have read a disklabel that has both partitions 'c'
          and 'd', and RAW_PART has p_offset != 0 or p_size == 0,
          but the other partition is suitable for a raw partition
          (p_offset == 0, p_size != 0), then swap the two partitions
          and use the new raw partition.

        2 If the architecture's raw partition is 'd', and if there
          is no partition 'd', but there is a partition 'c' that
          is suitable for a raw partition, then copy partition 'c'
          to partition 'd'.

        3 Determine the drive's last sector, using either the
          d_secperunit the drive reported, or by guessing (0x1fffffff).
          If we cannot read the drive's last sector, then fail.

        4 If we have read a disklabel that has no partition slot
          RAW_PART, then create a partition RAW_PART.  Make it span
          the whole drive.

        5 If there are fewer than MAXPARTITIONS partitions,
          then "slide" the unsuitable raw partition RAW_PART, and
          subsequent partitions, into partition slots RAW_PART+1
          and subsequent slots.  Create a raw partition at RAW_PART.
          Make it span the whole drive.

The convertdisklabel() procedure can probably stand to be simplified,
but it ought to deal with all but an extraordinarily broken disklabel,
now.

i386: compiled and tested, sparc64: compiled, evbmips: compiled.

Sync with HEAD.

Chech for _LOCORE (aka asm source) before defining some enums instead
of inventing another symbol.

Split the disklabel checksum function into two, so we can pass the
length separately.
Use this for foreign-endianess labels in wedge autodiscovery, and
calculate the checksum of those before we swap various fields in the
label.

sync with head.

Add preliminary support for System V Boot File System.
Written by UCHIYAMA Yasushi <uch@netbsd>.

u_intN_t -> uintN_t

Add partition type names & number, label-name, and mount program for
filesystem UDF.

merge ktrace-lwp.

Sync with HEAD. Here we go again...

sync with head

Make it possible to use <sys/disklabel.h> from assembly source by
introducing OMIT_DKTYPENUMS and OMIT_FSTYPENUMS, which omits the
declaration of the enums.  Use this in the vax boot code to make
it build again.  Also use __CONCAT() instead of ##.

Use preprocessor magic to get all the info for each DKTYPE and FSTYPE into
a single line.

Make disklabel(8) and fdisk(8) into "host tools " last step:  build
and install ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-disklabel,
${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk by "reaching over" to
the sources in ${NETBSDSRCDIR}/sbin/{disklabel fdisk}/.

To avoid clashes with a build-host's header files, especially on
*BSD, the host-tools versions of fdisk and disklabel search for
#includes such as disklabel.h, disklabel_acorn.h, disklabel_gpt.h,
and bootinfo.h in a new #includes namespace, nbinclude/.  That is,
they #include <nbinclude/sys/disklabel.h>, <nbinclude/machine/disklabel.h>,
<nbinclude/sparc64/disklabel.h>, instead of <sys/disklabel.h> and
such.  I have also updated the system headers to #include from
nbinclude/-space when HAVE_NBTOOL_CONFIG_H is #defined.

Sync with HEAD.

Add a dtype for flash memory disks.

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD

De-__P.

Sync with HEAD

Revert previous; it is not the correct solution to the problem of
the host tool build in usr.sbin/installboot.

Only include machine/disklabel.h if MAXPARTITIONS is undefined.
With care should allow sys/disklabel.h to be used in MI/host code.

Include FS_VINUM in FS_MAXTYPES.
Note there are discrepencies between this list, and that of Free/OpenBSD.

Fix "#defined<tab>" nits.

Add definitions for Vinum.

Pull up revision 1.77 (requested by tv in ticket #1454):
Add a type for CGD.

Pull up revision 1.74 (requested by tv in ticket #1454):
add DTYPE_JFS2 and FS_JFS2 for IBM Journaled File System
this is to match FreeBSD's disklabel.h revision 1.73
FreeBSD change was requested by Hiten Pandya <hiten@uk.FreeBSD.org>

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22364, verified by myself.

Change bounds_check_with_label() to take a pointer to the disk structure,
rather than the label itself.  This paves the way for some future changes.

Change return type of readdisklabel() to const char *
I hope I've found all the correct places!

Add prototype for bounds_check_with_mediasize

Note that the FS_ definitions are for compatibility only.

Bump daddr_t to 64 bits. Replace it with int32_t in all places where
it was used on-disk, so that on-disk formats remain the same.
Remove ufs_daddr_t and ufs_lbn_t for the time being.

Catch up to -current.

sync kqueue with -current; this includes merge of gehenna-devsw branch,
merge of i386 MP branch, and part of autoconf rototil work

Add a type for CGD.

Add support for the Apple UFS variation on ffs
This is the bulk of PR #17345

The general approach is to use a run time deteriminable value
for DIRBLKSIZ.  Additional allowances are included for using
MAXSYMLINKLEN with FS_42INODEFMT and a shift in the cylinder group
cluster summary count array.  Support is added for managing
the Apple UFS volume label.

add FS_APPLEUFS
part of PR #17345

add DTYPE_JFS2 and FS_JFS2 for IBM Journaled File System
this is to match FreeBSD's disklabel.h revision 1.73
FreeBSD change was requested by Hiten Pandya <hiten@uk.FreeBSD.org>

Catch up to -current.

sync kqueue branch with HEAD

catch up with -current.

Remove the old device buffer queue interface.

Approved by: Jason R. Thorpe <thorpej@wasabisystems.com>

Catch up to -current.

Pull up revision 1.72 (requested by yamt in ticket #536):
constify diskerr().

catch up with -current.

constify diskerr().

catch up with -current on kqueue branch

Catch up to -current.

Catch up with -current.

turn p_fsize into a union { p_fsize, p_cdsession }; the latter member
is used to store the session offset on multi-session CDs

Catch up to -current.
(CVS: It's not just a program. It's an adventure!)

Make a definition of FSMAXTYPES always available, as discussed on
tech-kern. Helps validate partition types w/o needing the whole
list of partition type names.

Pull up revisions 1.68-1.69 (requested by skrll):
  Fix warnings about redefinition if <sys/disklabel.h> is used on
  its own.

Apply patch (requested by ad):
  Add Mylex DACC960, CAC-EISA, and I2O block/SCSI drivers.

Commit my "devvp" changes to the thorpej-devvp branch.  This
replaces the use of dev_t in most places with a struct vnode *.

This will form the basic infrastructure for real cloning device
support (besides being architecurally cleaner -- it'll be good
to get away from using numbers to represent objects).

Pull up revisions 1.64-1.67 (requested by fvdl):
  Increase the number of BSD disklabel partitions on i386 to 16.

Sync with HEAD

Catch up with -current.

Protect #include <sys/types.h> by #ifndef _LOCORE. <sys/types.h> isn't
asm-safe.

Sync with HEAD.

This file needs <machine/types.h> to DTRT wrt __HAVE_OLD_DISKLABEL.
disklabel(5) doesn't tell to include it explicitely (as other platforms),
so include <sys/types.h> implicitely

Pull up revision 1.61 (requested by abs):
  Add some support code to allow feature addition to mount:
  If both special and node are given (but no type), the disklabel
  is checked for the file system type before falling back to ffs.

Sync with head (for UBC+NFS fixes, mostly).

Missed RCSid in rev. 1.61.

Define __HAVE_OLD_DISKLABEL in <machine/types.h> for i386 (where the
other __HAVE_* defines are). Conditionalize definition of old
disklabel struct and ODIOC* definitions on it, allowing other ports
to bump the number of partitions in the label if they want to
(see comment in sys/disklabel.h).

#warn is _not_ the GCC CPP directive that gives a warning, #warning is.
(this code has, apparently, always been wrong, but current GCC is kind
enough to warn about unknown CPP directives.)

Sync with HEAD

Use highest bit of minor as an extra bit for the partition number to
bump the maximum partition number on NetBSD-i386 to 16. (Approved by fvdl)

Sync with HEAD.

lsu -> ld, by popular request.

Update thorpej_scsipi to -current as of a month ago

Add DTYPE_LSU.

If device and mountpoint are given without -t, and without a : in the
device, check the disklabel for filesystem type. Fall back to ffs as ever.

fsck_lfs can now write to the filesystem, allowing it to correct most
(though still not all) errors in a damaged lfs.  Segment byte accounting
is corrected in pass 5.  "fsck_lfs -p" will do a partial roll-forward,
verifying the checkpoint from the newer superblock.  fscknames[] is
updated so that fsck knows about fsck_lfs.

Make the ntfs entry in fscknames NULL - there is no fsck_ntfs.
Pointed out by Andy Doran in private e-mail.

Introduce new filesystem type FS_CCD so that an operator can mark the
ccd component partition.  Note that the ccd driver still allows partitions
of any types as components since an on-disk BSD disklabel isn't available
on some port.

Sync disklabel.5 with disklabel.h and dkio.h more closely.

s/alternate/alternative/ from rev. 1.5 of disklabel.5.

Add support for a "RAID" partition type.

Update for sys/buf.h/disksort_*() changes.

Initial commit of recent changes to make DEV_BSIZE go away.

Runs on i386, needs work on other arch's. Main kernel routines should be
fine, but a number of the stand programs need help.

cd, fd, ccd, wd, and sd have been updated. sd has been tested with non-512
byte block devices. vnd, raidframe, and lfs need work.

Non 2**n block support is automatic for LKM's and conditional for kernels
on "options NON_PO2_BLOCKS".

Define macro to translate disk unit/partition pair into device minor.

Sync w/ -current.

Add NTFS related constants.

Add '-f disktab' option to disklabel, via lib/6623 from
Greg A. Woods <woods@most.weird.com>. (Very) slightly tweaked disklabel.8

Add DTYPE_RAID.

use one define per static array instead of defining all three with DKTYPENAMES

ADFS -> FILECORE
ADFS is a IDE instance of the filecore filesystem so rename ADFS to FILECORE
to reflect the underlaying filesystem and to bring this in line with the
filecore filesystem in the tree.

constify some tables.

constify some tables.

constify some tables.

The ATAPI disktype is now rather fixed in stone since a device uses it for
booting (Shark).  Add to mainline.

Import 4.4BSD-Lite2

Import 4.4BSD-Lite for reference

Move fscknames from fsck.c to here and add ext2fs.

add multiple inclusion protection

Added new filesystem type and name.

add prototypes from <sys/cpu.h> to the appropriate places

fix extra spaces at ends of lines, etc.  (all spacing nits.)

Filesystem prototype changes

LOCORE -> _LOCORE

Move disk-specific ioctls out of <sys/disklabel.h> and into <sys/dkio.h>.
<sys/dkio.h> is in turn included by <sys/ioctl.h>, much like how
<sys/filio.h> and <sys/sockio.h> are handled.  This minimizes changes to
existing sources which use the disk ioctls.

Define DIOCLOCK which is used to lock and unlock the pack.

Add DIOCEJECT.

Add disk types for the ccd and vnd.

KERNEL -> _KERNEL

make kernel disklabel struct contain bootfile pointers, too, for uniformity.

Sync with CSRG.

fix two typos.

move arch dependence to archs.  clean up a bit.  deal with weird MAXPARTITONS.

make this valid C.  from trunk

make it valid C

don't wrap lines

correct proto

New RCS ID's, take two.  they're more aesthecially pleasant, and use 'NetBSD'

new standard, minimally intrusive ID format

add pmax to list of ports which don't do things w/cpu_disklabel

Update prototypes.

Amiga now has a machine/disklabel.h

Add da30 to the list of machines which have an empty cpu_disklabel.
(Seems like it's everyone except i386.)

Out with arch dependant stuff.

Move some arch dependant stuff out of here.

Changed amiga MAXPARTITIONS to 16.

Add filesystem type for Macintosh HFS.  We recognize it, but not much else
at this point.

cpu_disklabel needed for sparc

Set maximum number of partitions to 32 for amiga.
Add entry for AmigaDOS fast file system.
Add amiga to class of machines not using a custom disklabel.

Includes filesystem types from 4.4

pmax cpu_disklabel struct is empty.

Get rid of disklabel indirection functions.

add constants for a couple of disk types.  suggested by downsj@CSOS.ORST.EDU

type 9 is ISO-9660

Change mac -> mac68k for cpu_disklabel

delete hopping-functions cpu_{read,write,set}disklabel()

Changes from trunk.
conf.h, disk.h, disklabel.h: strategy functions return void.  dump functions
take dev, blkno, maddr, and length.
dkstat.h: Add CP_INTR.
mount.h: Make fsid_t a structure with two longs inside, now that quad is gone.
proc.h: Replace p_[us]time with p_[usi]ticks.
systm.h: Don't declare spl*() or psuedo-device attach functions.  Declare
endtsleep().  Change declaration of panic().
types.h: Replace u_quad and quad with u_quad_t and quad_t, which use the GCC
`long long' type.  Modify qaddr_t accordingly.
vnode.h: Change va_size and va_bytes to u_quad_ts.

sun3 like n-other platforms is currently using the empty cpu_disklabel struct

pc532 has an empty cpu_disklabel

Change "#endif FOO" to "#endif /* FOO */", to keep gcc -Wall, lint, etc.
from complaining about a trivial issue.

Need to include dkbad.h in one case..

more disklabel changes

add rcs ids as necessary, and also clean up headers

Add consistent multiple-inclusion protection.

initial import of 386bsd-0.1 sources

Initial revision