CVS log for src/sbin/fsck_ffs/pass5.c

Up to [cvs.NetBSD.org] / src / sbin / fsck_ffs

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

fsck_ffs(8): Fix whitespace issues.

- Nix trailing whitespace.
- Omit excessive blank lines.
- Insert missing blank lines between $NetBSD$ and copyright.

No functional change intended.

Pull up following revision(s) (requested by chs in ticket #161):

	sbin/fsck_ffs/setup.c: revision 1.106
	sbin/fsck_ffs/pass5.c: revision 1.57

ufs: more signed/unsigned fixes

Fix the previous signed/unsigned fixes to build on 32-bit,
including applying this commit from FreeBSD:

  commit 2d34afcd04207cf3fa3d5b7f467a890eae75da41
  Author: Kirk McKusick <mckusick@FreeBSD.org>
  Date:   Sun Oct 25 21:04:07 2020 +0000
    Use proper type (ino_t) for inode numbers to avoid improper sign extention
    in the Pass 5 checks. The manifestation was fsck_ffs exiting with this error:
      ** Phase 5 - Check Cyl groups
      fsck_ffs: inoinfo: inumber 18446744071562087424 out of range
    The error only manifests itself for filesystems bigger than about 100Tb.
    Reported by:  Nikita Grechikhin <ngrechikhin at yandex.ru>
    MFC after:    2 weeks
    Sponsored by: Netflix

Pull up following revision(s) (requested by chs in ticket #160):

	usr.sbin/makefs/ffs/ffs_alloc.c: revision 1.31
	sbin/tunefs/tunefs.c: revision 1.58
	sbin/fsck_ffs/setup.c: revision 1.105
	sbin/fsck_ffs/pass5.c: revision 1.56
	usr.sbin/makefs/ffs.c: revision 1.74
	usr.sbin/makefs/ffs/mkfs.c: revision 1.42
	usr.sbin/makefs/Makefile: revision 1.40
	sys/ufs/ffs/fs.h: revision 1.71
	sbin/fsdb/fsdb.c: revision 1.54
	sbin/resize_ffs/resize_ffs.c: revision 1.58
	sbin/fsck_ffs/pass4.c: revision 1.29
	usr.sbin/makefs/ffs/ffs_extern.h: revision 1.9
	sbin/newfs/mkfs.c: revision 1.133
	sys/ufs/ffs/ffs_alloc.c: revision 1.172
	sbin/fsck_ffs/pass1b.c: revision 1.24
	usr.sbin/dumpfs/dumpfs.c: revision 1.68
	sys/ufs/ffs/ffs_extern.h: revision 1.88
	usr.sbin/quotacheck/quotacheck.c: revision 1.51
	sys/ufs/ffs/ffs_subr.c: revision 1.54
	sbin/fsck_ffs/main.c: revision 1.91
	sbin/fsck_ffs/pass1.c: revision 1.63

ufs: fixed signed/unsigned bugs affecting large file systems

Apply these commits from FreeBSD:
  commit e870d1e6f97cc73308c11c40684b775bcfa906a2
  Author: Kirk McKusick <mckusick@FreeBSD.org>
  Date:   Wed Feb 10 20:10:35 2010 +0000
    This fix corrects a problem in the file system that treats large
    inode numbers as negative rather than unsigned. For a default
    (16K block) file system, this bug began to show up at a file system
    size above about 16Tb.
    To fully handle this problem, newfs must be updated to ensure that
    it will never create a filesystem with more than 2^32 inodes. That
    patch will be forthcoming soon.
    Reported by: Scott Burns, John Kilburg, Bruce Evans
    Followup by: Jeff Roberson
    PR:          133980
    MFC after:   2 weeks

  commit 81479e688b0f643ffacd3f335b4b4bba460b769d
  Author: Kirk McKusick <mckusick@FreeBSD.org>
  Date:   Thu Feb 11 18:14:53 2010 +0000
    One last pass to get all the unsigned comparisons correct.

In additional to the changes from FreeBSD, this commit includes quite a few
related changes to appease -Wsign-compare.

ufs: more signed/unsigned fixes

Fix the previous signed/unsigned fixes to build on 32-bit,
including applying this commit from FreeBSD:

  commit 2d34afcd04207cf3fa3d5b7f467a890eae75da41
  Author: Kirk McKusick <mckusick@FreeBSD.org>
  Date:   Sun Oct 25 21:04:07 2020 +0000

    Use proper type (ino_t) for inode numbers to avoid improper sign extention
    in the Pass 5 checks. The manifestation was fsck_ffs exiting with this error:

      ** Phase 5 - Check Cyl groups
      fsck_ffs: inoinfo: inumber 18446744071562087424 out of range

    The error only manifests itself for filesystems bigger than about 100Tb.

    Reported by:  Nikita Grechikhin <ngrechikhin at yandex.ru>
    MFC after:    2 weeks
    Sponsored by: Netflix

ufs: fixed signed/unsigned bugs affecting large file systems

Apply these commits from FreeBSD:

  commit e870d1e6f97cc73308c11c40684b775bcfa906a2
  Author: Kirk McKusick <mckusick@FreeBSD.org>
  Date:   Wed Feb 10 20:10:35 2010 +0000

    This fix corrects a problem in the file system that treats large
    inode numbers as negative rather than unsigned. For a default
    (16K block) file system, this bug began to show up at a file system
    size above about 16Tb.

    To fully handle this problem, newfs must be updated to ensure that
    it will never create a filesystem with more than 2^32 inodes. That
    patch will be forthcoming soon.

    Reported by: Scott Burns, John Kilburg, Bruce Evans
    Followup by: Jeff Roberson
    PR:          133980
    MFC after:   2 weeks

  commit 81479e688b0f643ffacd3f335b4b4bba460b769d
  Author: Kirk McKusick <mckusick@FreeBSD.org>
  Date:   Thu Feb 11 18:14:53 2010 +0000

    One last pass to get all the unsigned comparisons correct.


In additional to the changes from FreeBSD, this commit includes quite a few
related changes to appease -Wsign-compare.

Restore backward compatibility of UFS2 with previous NetBSD releases by
disabling support in UFS2 for extended attributes (including ACLs).
Add a new variant of UFS2 called "UFS2ea" that does support extended attributes.
Add new	fsck_ffs operations "-c	ea" and	"-c no-ea" to convert file systems
from UFS2 to UFS2ea and	vice-versa (both of which delete all existing extended
attributes in the process).

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")

Stick ffs_ in front of the following macros:
   fragstoblks()
   blkstofrags()
   fragnum()
   blknum()

to finish the job of distinguishing them from the lfs versions, which
Christos renamed the other day.

I believe this is the last of the overtly ambiguous exported symbols
from ffs... or at least, the last of the ones that conflicted with lfs.
ffs still pollutes the C namespace very broadly (as does ufs) and this
needs quite a bit more cleanup.

XXX: boo on macros with lowercase names. But I'm not tackling that just yet.

Stick ffs_, ext2_, chfs_, filecore_, cd9660_, or mfs_ in front of
the following symbols so as to disambiguate fully. (Christos already
did the lfs ones.)

   lblkno
   lblktosize
   lfragtosize
   numfrags
   blkroundup
   fragroundup

fsbtodb() -> FFS_FSBTODB(), EXT2_FSBTODB(), or MFS_FSBTODB()
dbtofsb() -> FFS_DBTOFSB() or EXT2_DBTOFSB()

(Christos already did the lfs ones a few days back)

resync with head

sync with head

Stuff UFS_ in front of a few of ufs's symbols to reduce namespace
pollution. Specifically:
   ROOTINO -> UFS_ROOTINO
   WINO -> UFS_WINO
   NXADDR -> UFS_NXADDR
   NDADDR -> UFS_NDADDR
   NIADDR -> UFS_NIADDR
   MAXSYMLINKLEN -> UFS_MAXSYMLINKLEN
   MAXSYMLINKLEN_UFS[12] -> UFS[12]_MAXSYMLINKLEN (for consistency)

Sort out ext2fs's misuse of NDADDR and NIADDR; fortunately, these have
the same values in ext2fs and ffs.

No functional change intended.

sync with head

stdlib.h, not malloc.h

WARNS=4

Sync with HEAD.

sync with head.

sync with HEAD

Make sure that the exit values are always sane, and use symbolic instead
of magic constants. Reviewed by go@

Pull up following revision(s) (requested by ghen in ticket #1590):
	sbin/fsck_ffs/pass4.c: revision 1.23
	sbin/fsck_ffs/pass5.c: revision 1.47
	sbin/fsck_ffs/pass2.c: revision 1.44
	sbin/fsck_ffs/pass1.c: revision 1.43
	sbin/fsck_ffs/pass3.c: revision 1.19
	sbin/fsck/progress.c: revision 1.3
	sbin/fsck_ffs/main.c: revision 1.61
	sbin/fsck/progress.h: revision 1.2
Improve the progress bar displayed by fsck_ffs -p -P.
The progress bar will now travel from 0 to 20% during pass 1, from 20%
to 95% during pass 2, and from 95% to 100% during passes 3, 4, and 5.
Previously, the progress bar was not displayed at all during pass 1,
slowly traveled from 0 to about 50% during pass 2, and then very rapidly
traveled from 50% to 100% during passes 3, 4, and 5.
Note that fsck_ffs is the only user of fsck/progress.{c,h}.

Improve the progress bar displayed by fsck_ffs -p -P.

The progress bar will now travel from 0 to 20% during pass 1, from 20%
to 95% during pass 2, and from 95% to 100% during passes 3, 4, and 5.
Previously, the progress bar was not displayed at all during pass 1,
slowly traveled from 0 to about 50% during pass 2, and then very rapidly
traveled from 50% to 100% during passes 3, 4, and 5.

Note that fsck_ffs is the only user of fsck/progress.{c,h}.

sprinkle const.

whitespace (pointed out by wiz@)

Kill __P(), ANSIfy and WARNS=2

Use -DPROGRESS to enable the progress bar, don't depend on SMALL.

Add a progress meter to fsck_ffs based on the work by thorpej presented
to the mailing lists last January. This is optional.

Cast to (long long int) to make last change compile on amd64.

if debug, print found/expected block & inode counts when incorrect

do not upgrade superblock or set FS_FLAGS_UPDATED unless -c 4 option
is provided.
add compatibility for filesystems before FFSv2 integration
these patches are from pr port-macppc/23925 and should also
fix problems discussed in pr kern/21404 and pr kern/21283

realloc pedant

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

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

When fixing the cstotal structure, use the right size to copy it back.
Also, remove some accidentally committed debug code from the previous
commit.

Initialize cg_irotor correctly in newcg, to avoid false positives
for bad cylinder groups.

Add support for UFS2. UFS2 is an enhanced FFS, adding support for
64 bit block pointers, extended attribute storage, and a few
other things.

This commit does not yet include the code to manipulate the extended
storage (for e.g. ACLs), this will be done later.

Originally written by Kirk McKusick and Network Associates Laboratories for
FreeBSD.

'NetBSD.org' and some mdoc fixes.

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.

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.

commit fix from pr bin/15449
this fixes FS_42POSTBLFMT compatibility

If SIGINFO is received, display summary information to stderr.
Based on changes in FreeBSD, via Chuck Cranor <chuck@research.att.com>

Some manual strength reduction.

Pull up revision 1.27 (requested by lukem):
  Call ffs_sb_swap() with the correct arguments.  Fixes problems
  with using other-endian file systems.

Pull up revisions 1.25-1.26 (requested by lukem):
  Jumbo pullup for fsck_ffs:
   o fix incorrect error message
   o mark initialized globals with ``extern''
   o make reconnect algorithm O(n) instead of O(n^4)
   o remove dead code
   o don't swap cg_clustersum(cg)[0], it's a bitmap
   o ensure rotor values are positive
   o some code restructuring
   o fix byte swapping bug
   o pass5: check alternate superblocks for consistency with in-core master
   o fix usage message

remove third argument (`int ns') from ffs_sb_swap(), and let ffs_sb_swap()
determine the endianness of the `struct fs *o' superblock from o->fs_magic
and set needswap as necessary, rather than trusting the caller to get
it right.  invariably, almost every caller of ffs_sb_swap() was calling it
with ns set to the wrong value for ns anyway!
ansi KNF ffs_bswap.c declarations whilst here.

this fixes all sorts of problems when trying to use other-endian file systems,
notably the kernel trying to access memory *way* off, possibly corrupting or
panicing, and userland programs SEGVing and/or corrupting things (e.g,
"fsck_ffs -B"  to swap a file system endianness).

whilst the previous rev of ffs_bswap.c (1.10, 2000/12/23) made this problem
worse, i suspect that the problem was always there and previous versions
just happened not to trash things at the wrong time.

FFS_EI should now be a lot more stable.

In pass 5, check alternate superblocks for consistency with
the current in-core master superblock, and fix them up if
they're incorrect.  Move the code that writes the alternate
superblocks if (cvtlevel || doswap) into pass 5 for efficiency.

Reviewd by Charles Hannum, and used by me to fix up a curdled
file system.

Make sure the rotor values are non-negative.

Approved by thorpej:
Add a missing newline to message.

basesrc/sbin/fsck_ffs/pass5.c				1.23 -> 1.24

Add a missing newline in one message.
(The fact that I got this message using softdep should probably disturb
someone...)

Pull up to last week's -current.

Add a missing '\n'.

Fix %d <-> long mismatch.

Changes for softdep code.

Fix some merge mistakes.

Remove unused variable decl. From Ethan Solomita.

Bring in Kirk McKusick's FFS softdep code on a branch.

from Erik Bertelsen <erik@mediator.uni-c.dk>
 { put } { in } { lots } { of } { these } { to } { shut } { up } { egcs }

Add support for non-native byteorder FFS, and converting byteorder.
Also, be a bit more conservative with the clean flag: don't mark the FS
clean when we know there may still be errors (user anserwed 'n' to
a question, or fsck says "you must rerun fsck").

resolve conflicts from lite-2 merge.

imported from lite-2

* cleanup for WARNS=1
* deprecate register
* cleanup manpage
* remove unused docheck() func
* prefix hex numbers with '0x'
* getopt returns -1 not EOF

- util.h -> fsutil.h

- fixed all printf formats [there were a lot of %l? <-> %? mistakes]
- added missing prototypes, and made local functions static
- removed parallel preening code; this is part of fsck(8)
- use printing utilities from fsck(8)
- Makefile does not make links to fsck and fsck.8
- removed -l maxparallel option. It has no meaning anymore.

type sizes

convert to new RCS Id conventions; reduce my headache

Mostly sync with CSRG.

light clean, and make it compile against new header files.

more cleanups from Jim Jegers, passed over by me.

Use the S_IS*() macros, and make this compile again after Chris's changes to ufs.

Remove some more uses of obsolete functions.

Eliminate uses of some obsolete functions.

Import 4.4-Lite version.

Update from 4.4-Lite, with local changes.

need <sys/time.h>

Add RCS identifiers.

changed "Id" to "Header" for rcsids

added rcs ids to all files

initial import of 386bsd-0.1 sources

Initial revision