UFS2 preparation commit:

Remove support for converting old FFS formats to newer.

Submitted by:	mckusick
Sponspored by: DARPA & NAI Labs.

1 files changed, 0 insertions, 27 deletions

diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index e3fd6ea..ef31787 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -243,24 +243,6 @@ checkinode(ino_t inumber, struct inodesc *idesc)
 	if (mode == IFBLK || mode == IFCHR)
 		ndb++;
 	if (mode == IFLNK) {
-		if (doinglevel2 &&
-		    dp->di_size > 0 && dp->di_size < MAXSYMLINKLEN &&
-		    dp->di_blocks != 0) {
-			symbuf = alloca(secsize);
-			if (bread(fsreadfd, symbuf,
-			    fsbtodb(&sblock, dp->di_db[0]),
-			    (long)secsize) != 0)
-				errx(EEXIT, "cannot read symlink");
-			if (debug) {
-				symbuf[dp->di_size] = 0;
-				printf("convert symlink %lu(%s) of size %ld\n",
-				    (u_long)inumber, symbuf, (long)dp->di_size);
-			}
-			dp = ginode(inumber);
-			memmove(dp->di_shortlink, symbuf, (long)dp->di_size);
-			dp->di_blocks = 0;
-			inodirty();
-		}
 		/*
 		 * Fake ndb value so direct/indirect block checks below
 		 * will detect any garbage after symlink string.
@@ -319,15 +301,6 @@ checkinode(ino_t inumber, struct inodesc *idesc)
 	} else
 		inoinfo(inumber)->ino_state = FSTATE;
 	inoinfo(inumber)->ino_type = IFTODT(mode);
-	if (doinglevel2 &&
-	    (dp->di_ouid != (u_short)-1 || dp->di_ogid != (u_short)-1)) {
-		dp = ginode(inumber);
-		dp->di_uid = dp->di_ouid;
-		dp->di_ouid = -1;
-		dp->di_gid = dp->di_ogid;
-		dp->di_ogid = -1;
-		inodirty();
-	}
 	badblk = dupblk = 0;
 	idesc->id_number = inumber;
 	if (dp->di_flags & SF_SNAPSHOT)