CVS log for src/sbin/scan_ffs/scan_ffs.c

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Pull up following revision(s) (requested by mlelstv in ticket #94):

	sbin/scan_ffs/Makefile: revision 1.11
	sbin/scan_ffs/scan_ffs.c: revision 1.37

Work on swapped-endian FFS.

Work on swapped-endian FFS.

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

O_CLOEXEC is not a mode :-)

- use /dev/tty instead of stderr for SIGINFO messages
- use uintmax_t instead of ull
- print fractional percentage to show that we are making progress on large
  disks.

add SIGINFO support.  now you can know how far along the scan is.

Teach scan_ffs about lfs64.
(and also about byte-swapped lfs volumes, which might or might not
actually work)

Add a (draft) 64-bit superblock. Make things build again.

Add pieces of support for using both superblock types where
convenient, and specifically to the superblock accessors, but don't
actually enable it anywhere.

First substantive step on PR 50000.

Use accessor functions for the version field of the lfs superblock.
I thought at first maybe the cases that test the version should be
rolled into the accessors, but on the whole I think the conclusion on
that is no.

Fix assorted 64 -> 32 truncations in lfs. Also, some minor tidyups and
corrections in passing.

Add a new lfs header file: lfs_accessors.h.

This contains all the accessor functions and macros out of lfs.h.
Add an include of lfs_accessors.h after all uses of lfs.h... except
for code that wants to define its own struct lfs-alike that the
accessors are supposed to play along with. For these, set STRUCT_LFS
and include lfs_accessors.h after the necessary structure has been
defined, so that lfs_accessors.h can emit functions in terms of it.

More lfs superblock accessors.
(This changes the rest of the code over; all the accessors were
already added.)

The difference between this commit and the previous one is arbitrary,
but the previous one passed the regression tests on its own so I'm
keeping it separate to help with any bisections that might be needed
in the future.

Switch to accessor functions for elements of the LFS on-disk
superblock. This will allow switching between 32/64 bit forms on the
fly; it will also allow handling LFS_EI reasonably tidily. (That
currently doesn't work on the superblock.)

It also gets rid of cpp abuse in the form of fake structure member
macros.

Also, instead of doing sleep/wakeup on &lfs_avail and &lfs_nextseg
inside the on-disk superblock, add extra elements to the in-memory
struct lfs for this. (XXX: these should be changed to condvars, but
not right now)

XXX: this migrates a structure needed by the lfs code in libsa (struct
salfs) into lfs.h, where it doesn't belong, but for the time being
this is necessary in order to allow the accessors (and the various
lfs macros and other goop that relies on them) to compile.

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

resync from head

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

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

Rename ambiguous macros:
   MAXDIRSIZE -> UFS_MAXDIRSIZE or LFS_MAXDIRSIZE
   NINDIR -> FFS_NINDIR, EXT2_NINDIR, LFS_NINDIR, or MFS_NINDIR
   INOPB -> FFS_INOPB, LFS_INOPB
   INOPF -> FFS_INOPF, LFS_INOPF
   blksize -> ffs_blksize, ext2_blksize, or lfs_blksize
   sblksize -> ffs_blksize

These are not the only ambiguously defined filesystem macros, of
course, there's a pile more. I may not have found all the ambiguous
definitions of blksize(), too, as there are a lot of other things
called 'blksize' in the system.

Sync with HEAD.

Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html

fix sign-compare issues

sync with HEAD

Sync with HEAD.

convert __attribute__s to applicable cdefs.h macros

sync with HEAD

Use a two clause license for all the code I contributed.

The envsys code will be changed later.

Add -b flag into usage().

Add a "-b" option to search a partition for valid alternate superblocks,
rather than searching the disk for partitions.  Also, test LFS superblock
checksums before we report them.

* There's no need to use an int to store the returned value of
  ffs_checkver() and later use it in the switch statement, just
  use ffs_checkver.
* Remove unneded <sys/queue.h> header.
* Remove LFS from fstypes, it was never used.
* Increase SBCOUNT to 128, works faster.
* Remove unneded casts.
* (-F mode) close fd when the scan has finished or if pread() failed.
* (-F mode) print total size of file.

Use O_DIRECT (aka Direct I/O) when -F is used.

Detect FFSv1 partitions with fragsize/blocksize greater than
2048/16384.

Pull up following revision(s) (requested by wiz in ticket #156):
	sbin/scan_ffs/scan_ffs.8: revision 1.10
	sbin/scan_ffs/scan_ffs.c: revision 1.13
Sort options in usage and SYNOPSIS.

Sort options in usage and SYNOPSIS.

Pull up following revision(s) (requested by xtraeme in ticket #146):
	sbin/scan_ffs/scan_ffs.8: revision 1.7
	sbin/scan_ffs/scan_ffs.8: revision 1.8
	sbin/scan_ffs/scan_ffs.8: revision 1.9
	sbin/scan_ffs/scan_ffs.c: revision 1.10
	sbin/scan_ffs/scan_ffs.c: revision 1.11
	sbin/scan_ffs/scan_ffs.c: revision 1.12
Add -f file support. Useful to search for partitions on disk images.
Change -f to -F, per mrg's suggestion.
- Change the cast of st_size to uint64_t to avoid future problems
  with large files.
- u_uintXX_t -> uintXX_t

- Change the cast of st_size to uint64_t to avoid future problems
  with large files.
- u_uintXX_t -> uintXX_t

Change -f to -F, per mrg's suggestion.

Add -f file support. Useful to search for partitions on disk images.

Pull up following revision(s) via patch (requested by ghen in ticket #1460):
	distrib/sets/lists/base/mi: revision 1.556, 1.565
	distrib/sets/lists/man/mi: revision 1.792, 1.814
	sbin/Makefile: revision 1.94
	sbin/scan_ffs/Makefile: revision 1.1-1.3, 1.5-1.7
	sbin/scan_ffs/scan_ffs.c: revision 1.1-1.9
	sbin/scan_ffs/scan_ffs.8: revision 1.1-1.6 via patch
Add scan_ffs(8) from OpenBSD, modified for NetBSD to support FFSv2 and
LFS (scan_lfs(8)).  Utility to find FFSv1, FFSv2 and LFS partitions on
disks, useful to recover lost disklabels.

file scan_ffs.c was added on branch netbsd-3 on 2006-08-11 04:41:25 +0000

Remove an extra conditional while searching for LFS superblocks,
it's not needed.

Undefine the 17 macros commonly defined by <ufs/ffs/fs.h> and
<ufs/lfs/lfs.h> before including the second of them, and also after
including the second, to ensure the rest of the code doesn't depend
on their (ambigious) definition.

This fixes a build problem for vax; gcc 2.95.3's preprocessor
apparently doesn't like redefinition of macros.

Discussed with xtraeme.

* Replace lseek() and read() calls with one single pread()
* Align cpg/sgs correctly.

Pass lint and get/setprogname.

Add scan_lfs(8), utility to find LFS partitions on disk, useful
to recover lost disklabels.

Add missing '\n' into usage().

WARNS=4, misc cleanups.
- void casts
- remove unused notreached
- use a loop instead of code duplication
- use switches and #define constants

Use EXIT_{SUCCESS,FAILURE}.

Add scan_ffs(8) from OpenBSD, it was modified to support FFSv2
for NetBSD (with different blocksizes). Utility to find
FFSv1 and FFSv2 partitions on disks, useful to recover lost
disklabels.

Reviewed by christos.