Finished (?) merging with Lite2: cleaned up #include mess.
Fixed misformatting in a comment.
This commit is contained in:
parent
473e3a9ab9
commit
04aba25407
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=23796
@ -41,8 +41,7 @@ static const char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95";
|
|||||||
#include <ufs/ufs/dinode.h>
|
#include <ufs/ufs/dinode.h>
|
||||||
#include <ufs/ufs/dir.h>
|
#include <ufs/ufs/dir.h>
|
||||||
#include <ufs/ffs/fs.h>
|
#include <ufs/ffs/fs.h>
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -489,7 +488,7 @@ linkup(orphan, parentdir)
|
|||||||
pwarn("DIR I=%lu CONNECTED. ", orphan);
|
pwarn("DIR I=%lu CONNECTED. ", orphan);
|
||||||
if (parentdir != (ino_t)-1) {
|
if (parentdir != (ino_t)-1) {
|
||||||
printf("PARENT WAS I=%lu\n", parentdir);
|
printf("PARENT WAS I=%lu\n", parentdir);
|
||||||
/*
|
/*
|
||||||
* The parent directory, because of the ordering
|
* The parent directory, because of the ordering
|
||||||
* guarantees, has had the link count incremented
|
* guarantees, has had the link count incremented
|
||||||
* for the child, but no entry was made. This
|
* for the child, but no entry was made. This
|
||||||
|
@ -41,8 +41,7 @@ static const char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95";
|
|||||||
#include <ufs/ufs/dinode.h>
|
#include <ufs/ufs/dinode.h>
|
||||||
#include <ufs/ufs/dir.h>
|
#include <ufs/ufs/dir.h>
|
||||||
#include <ufs/ffs/fs.h>
|
#include <ufs/ffs/fs.h>
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -489,7 +488,7 @@ linkup(orphan, parentdir)
|
|||||||
pwarn("DIR I=%lu CONNECTED. ", orphan);
|
pwarn("DIR I=%lu CONNECTED. ", orphan);
|
||||||
if (parentdir != (ino_t)-1) {
|
if (parentdir != (ino_t)-1) {
|
||||||
printf("PARENT WAS I=%lu\n", parentdir);
|
printf("PARENT WAS I=%lu\n", parentdir);
|
||||||
/*
|
/*
|
||||||
* The parent directory, because of the ordering
|
* The parent directory, because of the ordering
|
||||||
* guarantees, has had the link count incremented
|
* guarantees, has had the link count incremented
|
||||||
* for the child, but no entry was made. This
|
* for the child, but no entry was made. This
|
||||||
|
@ -41,8 +41,7 @@ static const char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95";
|
|||||||
#include <ufs/ufs/dinode.h>
|
#include <ufs/ufs/dinode.h>
|
||||||
#include <ufs/ufs/dir.h>
|
#include <ufs/ufs/dir.h>
|
||||||
#include <ufs/ffs/fs.h>
|
#include <ufs/ffs/fs.h>
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -489,7 +488,7 @@ linkup(orphan, parentdir)
|
|||||||
pwarn("DIR I=%lu CONNECTED. ", orphan);
|
pwarn("DIR I=%lu CONNECTED. ", orphan);
|
||||||
if (parentdir != (ino_t)-1) {
|
if (parentdir != (ino_t)-1) {
|
||||||
printf("PARENT WAS I=%lu\n", parentdir);
|
printf("PARENT WAS I=%lu\n", parentdir);
|
||||||
/*
|
/*
|
||||||
* The parent directory, because of the ordering
|
* The parent directory, because of the ordering
|
||||||
* guarantees, has had the link count incremented
|
* guarantees, has had the link count incremented
|
||||||
* for the child, but no entry was made. This
|
* for the child, but no entry was made. This
|
||||||
|
Loading…
Reference in New Issue
Block a user