OpenBSD CVS

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


[BACK] Up to [local] / src / sbin / fsck_ffs

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.35 / (download) - annotate - [select for diffs], Sat Feb 3 18:51:57 2024 UTC (3 months, 3 weeks ago) by beck
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, HEAD
Changes since 1.34: +3 -3 lines
Diff to previous 1.34 (colored)

Remove Softdep.

Softdep has been a no-op for some time now, this removes it to get
it out of the way.

Flensing mostly done in Talinn, with some help from krw@

ok deraadt@

Revision 1.34 / (download) - annotate - [select for diffs], Tue Jan 9 03:16:00 2024 UTC (4 months, 3 weeks ago) by guenther
Branch: MAIN
Changes since 1.33: +4 -8 lines
Diff to previous 1.33 (colored)

Delete support for FFS filesystems before the in-inode symlink
optimization.  As observed by ali_farzanrad(at)riseup.net, support
for these was broken in the 5.5 release in early 2014 by the time_t
changes.  No one noticed before now, so clearly this isn't something
we need to continue to support; rejecting in ffs_validate() is an
improvement.

Also: simplify DIRSIZ(), drop OLDDIRFMT and NEWDIRFMT, tests of
fs_maxsymlinklen against zero, #ifdef tests of FS_44INODEFMT, and
remove support for newfs -O0, last used in 2016.

ok miod@

Revision 1.33 / (download) - annotate - [select for diffs], Wed Feb 8 08:25:44 2023 UTC (15 months, 3 weeks ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.32: +2 -5 lines
Diff to previous 1.32 (colored)

dump/fsck_ffs: convert two function definitions to ansi, missed
in previous passes some decades ago. Less noise from clang 15.

ok claudio

Revision 1.32 / (download) - annotate - [select for diffs], Tue Jan 20 18:22:21 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.31: +2 -2 lines
Diff to previous 1.31 (colored)

Adjust <sys/param.h> comments regarding use of use of MAXFRAG, or
delete <sys/param.h> if now possible
ok guenther

Revision 1.31 / (download) - annotate - [select for diffs], Fri Jan 16 06:39:57 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.30: +5 -4 lines
Diff to previous 1.30 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.30 / (download) - annotate - [select for diffs], Sat Sep 6 04:05:40 2014 UTC (9 years, 8 months ago) by guenther
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

inodesc.id_entryno holds a file size, so upgrade it from int to u_int64_t;
  this fixes handling of very large files on FFS2.
Correct a copy-n-pasto that rendered useless the check for allocated
  fragmented that are marked free in the bitmap.
allocdir() returns an inode number, so return an ino_t.
sizeof()*N should be printed with %zu, while direct and indirect block
  numbers should be cast to (long long) use %lld

inodesc.id_entryno fix based on a diff from David Vasek <vasek@fido.cz>
ok krw@ otto@

Revision 1.29 / (download) - annotate - [select for diffs], Tue Jun 11 16:42:04 2013 UTC (10 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.28: +4 -4 lines
Diff to previous 1.28 (colored)

final removal of daddr64_t.  daddr_t has been 64 bit for a long enough
test period; i think 3 years ago the last bugs fell out.
ok otto beck others

Revision 1.28 / (download) - annotate - [select for diffs], Wed Apr 24 13:46:29 2013 UTC (11 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.27: +5 -3 lines
Diff to previous 1.27 (colored)

pretty print bigger off_t
ok tedu otto

Revision 1.27 / (download) - annotate - [select for diffs], Sun May 8 14:38:40 2011 UTC (13 years ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.26: +2 -2 lines
Diff to previous 1.26 (colored)

Small memory optimization from NetBSD; ok krw@ millert@

Revision 1.26 / (download) - annotate - [select for diffs], Sun Apr 24 07:07:03 2011 UTC (13 years, 1 month ago) by otto
Branch: MAIN
Changes since 1.25: +7 -62 lines
Diff to previous 1.25 (colored)

remove support for (very) old ffs on-disk formats; ok krw@ and no
objection form the usual suspects

Revision 1.25 / (download) - annotate - [select for diffs], Sat Apr 16 16:37:21 2011 UTC (13 years, 1 month ago) by otto
Branch: MAIN
Changes since 1.24: +9 -9 lines
Diff to previous 1.24 (colored)

Blend in some code from netbsd and freebsd that reduces memory consumption
and speeds things up in a lot of cases.
Prompted by Amit Kulkarni; ok krw@ on a slighly diffrenent incarnation

Revision 1.24 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:32 2009 UTC (14 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.23: +1 -9 lines
Diff to previous 1.23 (colored)

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable).  these days, people use source.  these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

Revision 1.23 / (download) - annotate - [select for diffs], Tue Jun 10 23:10:29 2008 UTC (15 years, 11 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.22: +11 -11 lines
Diff to previous 1.22 (colored)

reduce mem usage by about 20% by packing state and type of an inode in a single
byte. Original diff by drahn@; twists by me; ok millert@ thib@

Revision 1.22 / (download) - annotate - [select for diffs], Sun Sep 16 17:42:40 2007 UTC (16 years, 8 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.21: +3 -3 lines
Diff to previous 1.21 (colored)

Do not use DIP() as an lvalue; founc by pcc. ok millert@ ray@

Revision 1.21 / (download) - annotate - [select for diffs], Mon Jun 25 19:59:55 2007 UTC (16 years, 11 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.20: +5 -5 lines
Diff to previous 1.20 (colored)

Teach fsck_ffs about 64-bit block addresses. ok (and help) moritz@ pedro@

Revision 1.20 / (download) - annotate - [select for diffs], Tue Apr 10 16:08:17 2007 UTC (17 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.19: +48 -46 lines
Diff to previous 1.19 (colored)

Add support for checking ffs2 filesystems.  From pedro@ based on
the ufs2 changes in FreeBSD by Kirk Mckusick.

Revision 1.19 / (download) - annotate - [select for diffs], Thu Feb 8 13:09:53 2007 UTC (17 years, 3 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.18: +7 -3 lines
Diff to previous 1.18 (colored)

A corrrup inode might lead to preposterous dir sizes. So check the
size to avoid a negative lastbn which might cause a segv or heap
corruption. With help from mickey@; ok mickey@ pedro@ millert@

Revision 1.18 / (download) - annotate - [select for diffs], Wed Jan 24 13:24:58 2007 UTC (17 years, 4 months ago) by bluhm
Branch: MAIN
Changes since 1.17: +10 -2 lines
Diff to previous 1.17 (colored)

A reallocated root directory gets ownership of the fsck process.
If lost+found is created, it gets ownership of the root directory.

ok pedro

Revision 1.17 / (download) - annotate - [select for diffs], Mon Jul 5 02:31:54 2004 UTC (19 years, 11 months ago) by pvalchev
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8, OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.16: +2 -3 lines
Diff to previous 1.16 (colored)

remove useless (always false) check; ok millert henning

Revision 1.16 / (download) - annotate - [select for diffs], Mon Aug 25 23:28:15 2003 UTC (20 years, 9 months ago) by tedu
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5, OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.15: +10 -10 lines
Diff to previous 1.15 (colored)

rename struct dinode to ufs1_dinode.  clears the namespace and makes
way for some future work.  no function changes yet.
help testing otto@ and markus@

Revision 1.15 / (download) - annotate - [select for diffs], Mon Jun 2 20:06:15 2003 UTC (21 years ago) by millert
Branch: MAIN
Changes since 1.14: +3 -7 lines
Diff to previous 1.14 (colored)

Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999.  Proofed by myself and Theo.

Revision 1.14 / (download) - annotate - [select for diffs], Sat Apr 26 00:39:28 2003 UTC (21 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.13: +4 -4 lines
Diff to previous 1.13 (colored)

string cleaning; ok tedu

Revision 1.13 / (download) - annotate - [select for diffs], Fri Aug 23 09:09:04 2002 UTC (21 years, 9 months ago) by gluk
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3, OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.12: +22 -49 lines
Diff to previous 1.12 (colored)

- Convert function definitions to new style
- eliminate trailing whitespace
- remove casts that aren't needed.
- make rcsid strings const, for -Wall compilation.

 from tedu <grendel@zeitbombe.org>

Revision 1.12 / (download) - annotate - [select for diffs], Sun Jun 9 08:13:05 2002 UTC (21 years, 11 months ago) by todd
Branch: MAIN
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

rm trailing whitespace

Revision 1.11 / (download) - annotate - [select for diffs], Sat Feb 16 21:27:34 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.10: +9 -9 lines
Diff to previous 1.10 (colored)

Part one of userland __P removal.  Done with a simple regexp with some minor hand editing to make comments line up correctly.  Another pass is forthcoming that handles the cases that could not be done automatically.

Revision 1.10 / (download) - annotate - [select for diffs], Mon Nov 5 07:39:16 2001 UTC (22 years, 7 months ago) by mpech
Branch: MAIN
Changes since 1.9: +22 -22 lines
Diff to previous 1.9 (colored)

kill more registers;

millert@ ok

Revision 1.8.2.1 / (download) - annotate - [select for diffs], Wed Jun 6 04:06:54 2001 UTC (23 years ago) by jason
Branch: OPENBSD_2_9
Changes since 1.8: +17 -25 lines
Diff to previous 1.8 (colored) next main 1.9 (colored)

Pull in patch from current:
Fix (gluk):
Fix directory state tracking.

- If the lost+found directory is created by fsck, it will do a cacheino()
  which sets the inoinfo's i_parent and i_dotdot to 0, but they never get
  set to ROOTINO. This means that propagate will never find lost+found and
  its descendents, subdirectories will remain DSTATE (instead of DFOUND)
  even though they are correctly linked in, and pass4.c will try to
  clear them unsuccessfully, thinking that there is no link count from the
  DSTATE directory's parent. The result is that you need to run fsck twice
  and get "EXTRANEOUS HARD LINK TO DIRECTORY" error (which are unexpected
  and fatal when running in preen mode). The fix is to set i_parent and
  i_dotdot to "parent" after the second cacheino() call in dir.c:allocdir().
  From NetBSD via FreeBSD.
- modify propagate() so it be able to start from any point in the tree.
- minor tweaks to get more generality in state propagation.

In other words fsck doesn't leave unremovable directories anymore.

costa@ ok.

Revision 1.9 / (download) - annotate - [select for diffs], Mon May 28 21:22:47 2001 UTC (23 years ago) by gluk
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.8: +17 -25 lines
Diff to previous 1.8 (colored)

Fix directory state tracking.

- If the lost+found directory is created by fsck, it will do a cacheino()
  which sets the inoinfo's i_parent and i_dotdot to 0, but they never get
  set to ROOTINO. This means that propagate will never find lost+found and
  its descendents, subdirectories will remain DSTATE (instead of DFOUND)
  even though they are correctly linked in, and pass4.c will try to
  clear them unsuccessfully, thinking that there is no link count from the
  DSTATE directory's parent. The result is that you need to run fsck twice
  and get "EXTRANEOUS HARD LINK TO DIRECTORY" error (which are unexpected
  and fatal when running in preen mode). The fix is to set i_parent and
  i_dotdot to "parent" after the second cacheino() call in dir.c:allocdir().
  From NetBSD via FreeBSD.
- modify propagate() so it be able to start from any point in the tree.
- minor tweaks to get more generality in state propagation.

In other words fsck doesn't leave unremovable directories anymore.

costa@ ok.

Revision 1.8 / (download) - annotate - [select for diffs], Fri Mar 2 08:33:55 2001 UTC (23 years, 3 months ago) by art
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE
Branch point for: OPENBSD_2_9
Changes since 1.7: +8 -5 lines
Diff to previous 1.7 (colored)

Make fsck aware of soft updates.
We had this in the tree 1997, but it went away because it was too close to
release.
Ok: csapuntz@
(as a size note: It's really good to test fsck when you are torture testing
the filesystems)

Revision 1.7 / (download) - annotate - [select for diffs], Mon Oct 6 20:22:31 1997 UTC (26 years, 8 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8, OPENBSD_2_7_BASE, OPENBSD_2_7, OPENBSD_2_6_BASE, OPENBSD_2_6, OPENBSD_2_5_BASE, OPENBSD_2_5, OPENBSD_2_4_BASE, OPENBSD_2_4, OPENBSD_2_3_BASE, OPENBSD_2_3, OPENBSD_2_2_BASE, OPENBSD_2_2
Changes since 1.6: +3 -6 lines
Diff to previous 1.6 (colored)

back out vfs lite2 till after 2.2

Revision 1.6 / (download) - annotate - [select for diffs], Mon Oct 6 15:33:32 1997 UTC (26 years, 8 months ago) by csapuntz
Branch: MAIN
Changes since 1.5: +8 -5 lines
Diff to previous 1.5 (colored)

VFS Lite2 Changes

Revision 1.5 / (download) - annotate - [select for diffs], Thu Mar 27 16:28:51 1997 UTC (27 years, 2 months ago) by kstailey
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE, OPENBSD_2_1
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)

use 700 not 777 for new lost+found dirs

Revision 1.4 / (download) - annotate - [select for diffs], Thu Feb 20 06:03:04 1997 UTC (27 years, 3 months ago) by tholo
Branch: MAIN
Changes since 1.3: +12 -3 lines
Diff to previous 1.3 (colored)

From FreeBSD [Terry Lambert]:

The following small diff fixes the annoying fsck bug that causes it to
need to be run twice to end up with correct reference counts for inodes
for directories that had subdirectories relocated into the lost+found
directory.

I found the need to rerun *extremely* annoying.  This fix causes the
count to be correctly adjusted later in pass 4 by correctly stating
the parent reference count.

Note that the parent reference count is incremented when the directory
entry is made (for ".."), but is not really there in the case of a
directory that does not make an entry in its parent dir.

This can be tested by waiting for the inode sync after cd'ing from a
shell into a test fs.  Then you "mkdir xxx yyy zzz", wait a second,
and hit the machine reset button.

Revision 1.3 / (download) - annotate - [select for diffs], Sun Oct 20 08:36:30 1996 UTC (27 years, 7 months ago) by tholo
Branch: MAIN
Changes since 1.2: +45 -32 lines
Diff to previous 1.2 (colored)

Sync with NetBSD 961019

Revision 1.2 / (download) - annotate - [select for diffs], Sun Jun 23 14:30:26 1996 UTC (27 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE, OPENBSD_2_0
Changes since 1.1: +2 -1 lines
Diff to previous 1.1 (colored)

update rcsid

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:43:31 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)

initial import of NetBSD tree

Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:43:31 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN

Initial revision

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.