Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reintroduce clarity changes made in rev1.14 that were lost in the lite2 merge

Browse Source
This commit is contained in:
lukem 1997-09-21 03:51:34 +00:00
parent 90c9455b48
commit ea79507baf
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sbin/fsck_ffs/pass2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pass2.c,v 1.22 1997/09/21 03:06:47 lukem Exp $ */
/* $NetBSD: pass2.c,v 1.23 1997/09/21 03:51:34 lukem Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: pass2.c,v 1.22 1997/09/21 03:06:47 lukem Exp $");
__RCSID("$NetBSD: pass2.c,v 1.23 1997/09/21 03:51:34 lukem Exp $");
#endif
#endif /* not lint */
@ -132,7 +132,6 @@ pass2()
memset(&curino, 0, sizeof(struct inodesc));
curino.id_type = DATA;
curino.id_func = pass2check;
dp = &dino;
inpend = &inpsort[inplast];
for (inpp = inpsort; inpp < inpend; inpp++) {
inp = *inpp;
@ -145,7 +144,6 @@ pass2()
dp = ginode(inp->i_number);
dp->di_size = inp->i_isize;
inodirty();
dp = &dino;
}
} else if ((inp->i_isize & (DIRBLKSIZ - 1)) != 0) {
getpathname(pathbuf, inp->i_number, inp->i_number);
@ -156,18 +154,17 @@ pass2()
inp->i_isize = roundup(inp->i_isize, DIRBLKSIZ);
if (preen || reply("ADJUST") == 1) {
dp = ginode(inp->i_number);
dp->di_size = roundup(inp->i_isize, DIRBLKSIZ);
dp->di_size = inp->i_isize;
inodirty();
dp = &dino;
}
}
memset(&dino, 0, sizeof(struct dinode));
dino.di_mode = IFDIR;
dp->di_size = inp->i_isize;
memmove(&dp->di_db[0], &inp->i_blks[0], (size_t)inp->i_numblks);
dino.di_size = inp->i_isize;
memmove(&dino.di_db[0], &inp->i_blks[0], (size_t)inp->i_numblks);
curino.id_number = inp->i_number;
curino.id_parent = inp->i_parent;
(void)ckinode(dp, &curino);
(void)ckinode(&dino, &curino);
}
/*
* Now that the parents of all directories have been found,