Merge the short-lived perseant-lfsv2 branch into the trunk.
Kernels and tools understand both v1 and v2 filesystems; newfs_lfs
generates v2 by default. Changes for the v2 layout include:
- Segments of non-PO2 size and arbitrary block offset, so these can be
matched to convenient physical characteristics of the partition (e.g.,
stripe or track size and offset).
- Address by fragment instead of by disk sector, paving the way for
non-512-byte-sector devices. In theory fragments can be as large
as you like, though in reality they must be smaller than MAXBSIZE in size.
- Use serial number and filesystem identifier to ensure that roll-forward
doesn't get old data and think it's new. Roll-forward is enabled for
v2 filesystems, though not for v1 filesystems by default.
- The inode free list is now a tailq, paving the way for undelete (undelete
is not yet implemented, but can be without further non-backwards-compatible
changes to disk structures).
- Inode atime information is kept in the Ifile, instead of on the inode;
that is, the inode is never written *just* because atime was changed.
Because of this the inodes remain near the file data on the disk, rather
than wandering all over as the disk is read repeatedly. This speeds up
repeated reads by a small but noticeable amount.
Other changes of note include:
- The ifile written by newfs_lfs can now be of arbitrary length, it is no
longer restricted to a single indirect block.
- Fixed an old bug where ctime was changed every time a vnode was created.
I need to look more closely to make sure that the times are only updated
during write(2) and friends, not after-the-fact during a segment write,
and certainly not by the cleaner.
2001-07-14 00:30:18 +04:00
|
|
|
/* $NetBSD: dir.c,v 1.5 2001/07/13 20:30:18 perseant Exp $ */
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 1980, 1986, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <ufs/ufs/dinode.h>
|
|
|
|
#include <ufs/ufs/dir.h>
|
2000-05-23 05:48:52 +04:00
|
|
|
#include <sys/mount.h> /* XXX */
|
1999-03-18 05:02:18 +03:00
|
|
|
#include <ufs/lfs/lfs.h>
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "fsck.h"
|
|
|
|
#include "fsutil.h"
|
|
|
|
#include "extern.h"
|
|
|
|
|
2000-05-23 05:48:52 +04:00
|
|
|
char *lfname = "lost+found";
|
|
|
|
int lfmode = 01700;
|
|
|
|
struct dirtemplate emptydir = {0, DIRBLKSIZ};
|
|
|
|
struct dirtemplate dirhead = {
|
1999-03-18 05:02:18 +03:00
|
|
|
0, 12, DT_DIR, 1, ".",
|
|
|
|
0, DIRBLKSIZ - 12, DT_DIR, 2, ".."
|
|
|
|
};
|
2000-05-23 05:48:52 +04:00
|
|
|
struct odirtemplate odirhead = {
|
1999-03-18 05:02:18 +03:00
|
|
|
0, 12, 1, ".",
|
|
|
|
0, DIRBLKSIZ - 12, 2, ".."
|
|
|
|
};
|
|
|
|
|
2000-05-23 05:48:52 +04:00
|
|
|
static int expanddir(struct dinode *, char *);
|
|
|
|
static void freedir(ino_t, ino_t);
|
|
|
|
static struct direct *fsck_readdir(struct inodesc *);
|
|
|
|
static struct bufarea *getdirblk(daddr_t, long);
|
|
|
|
static int lftempname(char *, ino_t);
|
|
|
|
static int mkentry(struct inodesc *);
|
|
|
|
static int chgino(struct inodesc *);
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Propagate connected state through the tree.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
propagate()
|
|
|
|
{
|
|
|
|
register struct inoinfo **inpp, *inp, *pinp;
|
|
|
|
struct inoinfo **inpend;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a list of children for each directory.
|
|
|
|
*/
|
|
|
|
inpend = &inpsort[inplast];
|
|
|
|
for (inpp = inpsort; inpp < inpend; inpp++) {
|
|
|
|
inp = *inpp;
|
|
|
|
if (inp->i_parent == 0 ||
|
|
|
|
inp->i_number == ROOTINO)
|
|
|
|
continue;
|
|
|
|
pinp = getinoinfo(inp->i_parent);
|
|
|
|
inp->i_parentp = pinp;
|
|
|
|
inp->i_sibling = pinp->i_child;
|
|
|
|
pinp->i_child = inp;
|
|
|
|
}
|
|
|
|
inp = getinoinfo(ROOTINO);
|
|
|
|
while (inp) {
|
|
|
|
statemap[inp->i_number] = DFOUND;
|
|
|
|
if (inp->i_child &&
|
|
|
|
statemap[inp->i_child->i_number] == DSTATE)
|
|
|
|
inp = inp->i_child;
|
|
|
|
else if (inp->i_sibling)
|
|
|
|
inp = inp->i_sibling;
|
|
|
|
else
|
|
|
|
inp = inp->i_parentp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Scan each entry in a directory block.
|
|
|
|
*/
|
|
|
|
int
|
2000-05-23 05:48:52 +04:00
|
|
|
dirscan(struct inodesc * idesc)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
register struct direct *dp;
|
|
|
|
register struct bufarea *bp;
|
2000-05-23 05:48:52 +04:00
|
|
|
int dsize, n;
|
|
|
|
long blksiz;
|
|
|
|
char dbuf[DIRBLKSIZ];
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
if (idesc->id_type != DATA)
|
|
|
|
errexit("wrong type to dirscan %d\n", idesc->id_type);
|
|
|
|
if (idesc->id_entryno == 0 &&
|
|
|
|
(idesc->id_filesize & (DIRBLKSIZ - 1)) != 0)
|
|
|
|
idesc->id_filesize = roundup(idesc->id_filesize, DIRBLKSIZ);
|
|
|
|
blksiz = idesc->id_numfrags * sblock.lfs_fsize;
|
Merge the short-lived perseant-lfsv2 branch into the trunk.
Kernels and tools understand both v1 and v2 filesystems; newfs_lfs
generates v2 by default. Changes for the v2 layout include:
- Segments of non-PO2 size and arbitrary block offset, so these can be
matched to convenient physical characteristics of the partition (e.g.,
stripe or track size and offset).
- Address by fragment instead of by disk sector, paving the way for
non-512-byte-sector devices. In theory fragments can be as large
as you like, though in reality they must be smaller than MAXBSIZE in size.
- Use serial number and filesystem identifier to ensure that roll-forward
doesn't get old data and think it's new. Roll-forward is enabled for
v2 filesystems, though not for v1 filesystems by default.
- The inode free list is now a tailq, paving the way for undelete (undelete
is not yet implemented, but can be without further non-backwards-compatible
changes to disk structures).
- Inode atime information is kept in the Ifile, instead of on the inode;
that is, the inode is never written *just* because atime was changed.
Because of this the inodes remain near the file data on the disk, rather
than wandering all over as the disk is read repeatedly. This speeds up
repeated reads by a small but noticeable amount.
Other changes of note include:
- The ifile written by newfs_lfs can now be of arbitrary length, it is no
longer restricted to a single indirect block.
- Fixed an old bug where ctime was changed every time a vnode was created.
I need to look more closely to make sure that the times are only updated
during write(2) and friends, not after-the-fact during a segment write,
and certainly not by the cleaner.
2001-07-14 00:30:18 +04:00
|
|
|
if (chkrange(idesc->id_blkno, fragstofsb(&sblock, idesc->id_numfrags))) {
|
1999-03-18 05:02:18 +03:00
|
|
|
idesc->id_filesize -= blksiz;
|
|
|
|
return (SKIP);
|
|
|
|
}
|
|
|
|
idesc->id_loc = 0;
|
|
|
|
for (dp = fsck_readdir(idesc); dp != NULL; dp = fsck_readdir(idesc)) {
|
|
|
|
dsize = dp->d_reclen;
|
|
|
|
memcpy(dbuf, dp, (size_t)dsize);
|
|
|
|
# if (BYTE_ORDER == LITTLE_ENDIAN)
|
|
|
|
if (!newinofmt) {
|
2000-05-23 05:48:52 +04:00
|
|
|
struct direct *tdp = (struct direct *)dbuf;
|
|
|
|
u_char tmp;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
tmp = tdp->d_namlen;
|
|
|
|
tdp->d_namlen = tdp->d_type;
|
|
|
|
tdp->d_type = tmp;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
idesc->id_dirp = (struct direct *)dbuf;
|
|
|
|
if ((n = (*idesc->id_func)(idesc)) & ALTERED) {
|
|
|
|
# if (BYTE_ORDER == LITTLE_ENDIAN)
|
|
|
|
if (!newinofmt && !doinglevel2) {
|
2000-05-23 05:48:52 +04:00
|
|
|
struct direct *tdp;
|
|
|
|
u_char tmp;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
tdp = (struct direct *)dbuf;
|
|
|
|
tmp = tdp->d_namlen;
|
|
|
|
tdp->d_namlen = tdp->d_type;
|
|
|
|
tdp->d_type = tmp;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
bp = getdirblk(idesc->id_blkno, blksiz);
|
|
|
|
memcpy(bp->b_un.b_buf + idesc->id_loc - dsize, dbuf,
|
2000-05-23 05:48:52 +04:00
|
|
|
(size_t)dsize);
|
1999-03-18 05:02:18 +03:00
|
|
|
dirty(bp);
|
|
|
|
sbdirty();
|
|
|
|
}
|
2000-05-23 05:48:52 +04:00
|
|
|
if (n & STOP)
|
1999-03-18 05:02:18 +03:00
|
|
|
return (n);
|
|
|
|
}
|
|
|
|
return (idesc->id_filesize > 0 ? KEEPON : STOP);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* get next entry in a directory.
|
|
|
|
*/
|
|
|
|
static struct direct *
|
2000-05-23 05:48:52 +04:00
|
|
|
fsck_readdir(struct inodesc * idesc)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
register struct direct *dp, *ndp;
|
|
|
|
register struct bufarea *bp;
|
2000-05-23 05:48:52 +04:00
|
|
|
long size, blksiz, fix, dploc;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
blksiz = idesc->id_numfrags * sblock.lfs_fsize;
|
|
|
|
bp = getdirblk(idesc->id_blkno, blksiz);
|
|
|
|
if (idesc->id_loc % DIRBLKSIZ == 0 && idesc->id_filesize > 0 &&
|
|
|
|
idesc->id_loc < blksiz) {
|
|
|
|
dp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);
|
|
|
|
if (dircheck(idesc, dp))
|
|
|
|
goto dpok;
|
|
|
|
if (idesc->id_fix == IGNORE)
|
|
|
|
return (0);
|
|
|
|
fix = dofix(idesc, "DIRECTORY CORRUPTED");
|
|
|
|
bp = getdirblk(idesc->id_blkno, blksiz);
|
|
|
|
dp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);
|
|
|
|
dp->d_reclen = DIRBLKSIZ;
|
|
|
|
dp->d_ino = 0;
|
|
|
|
dp->d_type = 0;
|
|
|
|
dp->d_namlen = 0;
|
|
|
|
dp->d_name[0] = '\0';
|
|
|
|
if (fix)
|
|
|
|
dirty(bp);
|
|
|
|
idesc->id_loc += DIRBLKSIZ;
|
|
|
|
idesc->id_filesize -= DIRBLKSIZ;
|
|
|
|
return (dp);
|
|
|
|
}
|
|
|
|
dpok:
|
|
|
|
if (idesc->id_filesize <= 0 || idesc->id_loc >= blksiz)
|
|
|
|
return NULL;
|
|
|
|
dploc = idesc->id_loc;
|
|
|
|
dp = (struct direct *)(bp->b_un.b_buf + dploc);
|
|
|
|
idesc->id_loc += dp->d_reclen;
|
|
|
|
idesc->id_filesize -= dp->d_reclen;
|
|
|
|
if ((idesc->id_loc % DIRBLKSIZ) == 0)
|
|
|
|
return (dp);
|
|
|
|
ndp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);
|
|
|
|
if (idesc->id_loc < blksiz && idesc->id_filesize > 0 &&
|
|
|
|
dircheck(idesc, ndp) == 0) {
|
|
|
|
size = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);
|
|
|
|
idesc->id_loc += size;
|
|
|
|
idesc->id_filesize -= size;
|
|
|
|
if (idesc->id_fix == IGNORE)
|
|
|
|
return (0);
|
|
|
|
fix = dofix(idesc, "DIRECTORY CORRUPTED");
|
|
|
|
bp = getdirblk(idesc->id_blkno, blksiz);
|
|
|
|
dp = (struct direct *)(bp->b_un.b_buf + dploc);
|
|
|
|
dp->d_reclen += size;
|
|
|
|
if (fix)
|
|
|
|
dirty(bp);
|
|
|
|
}
|
|
|
|
return (dp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify that a directory entry is valid.
|
|
|
|
* This is a superset of the checks made in the kernel.
|
|
|
|
*/
|
|
|
|
int
|
2000-05-23 05:48:52 +04:00
|
|
|
dircheck(struct inodesc * idesc, struct direct * dp)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
2000-05-23 05:48:52 +04:00
|
|
|
register int size;
|
|
|
|
register char *cp;
|
|
|
|
u_char namlen, type;
|
|
|
|
int spaceleft;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
spaceleft = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);
|
|
|
|
if (dp->d_ino >= maxino ||
|
|
|
|
dp->d_reclen == 0 ||
|
|
|
|
dp->d_reclen > spaceleft ||
|
2000-05-23 05:48:52 +04:00
|
|
|
(dp->d_reclen & 0x3) != 0) {
|
|
|
|
pwarn("ino too large, reclen=0, reclen>space, or reclen&3!=0\n");
|
|
|
|
pwarn("dp->d_ino = 0x%x\tdp->d_reclen = 0x%x\n",
|
|
|
|
dp->d_ino, dp->d_reclen);
|
|
|
|
pwarn("maxino = 0x%x\tspaceleft = 0x%x\n", maxino, spaceleft);
|
|
|
|
return (0);
|
|
|
|
}
|
1999-03-18 05:02:18 +03:00
|
|
|
if (dp->d_ino == 0)
|
|
|
|
return (1);
|
|
|
|
size = DIRSIZ(!newinofmt, dp, 0);
|
|
|
|
# if (BYTE_ORDER == LITTLE_ENDIAN)
|
|
|
|
if (!newinofmt) {
|
|
|
|
type = dp->d_namlen;
|
|
|
|
namlen = dp->d_type;
|
|
|
|
} else {
|
|
|
|
namlen = dp->d_namlen;
|
|
|
|
type = dp->d_type;
|
|
|
|
}
|
|
|
|
# else
|
|
|
|
namlen = dp->d_namlen;
|
|
|
|
type = dp->d_type;
|
|
|
|
# endif
|
|
|
|
if (dp->d_reclen < size ||
|
|
|
|
idesc->id_filesize < size ||
|
|
|
|
namlen > MAXNAMLEN ||
|
2000-05-23 05:48:52 +04:00
|
|
|
type > 15) {
|
|
|
|
printf("reclen<size, filesize<size, namlen too large, or type>15\n");
|
1999-03-18 05:02:18 +03:00
|
|
|
return (0);
|
2000-05-23 05:48:52 +04:00
|
|
|
}
|
1999-03-18 05:02:18 +03:00
|
|
|
for (cp = dp->d_name, size = 0; size < namlen; size++)
|
|
|
|
if (*cp == '\0' || (*cp++ == '/')) {
|
2000-05-23 05:48:52 +04:00
|
|
|
printf("name contains NUL or /\n");
|
1999-03-18 05:02:18 +03:00
|
|
|
return (0);
|
2000-05-23 05:48:52 +04:00
|
|
|
}
|
1999-03-18 05:02:18 +03:00
|
|
|
if (*cp != '\0') {
|
2000-05-23 05:48:52 +04:00
|
|
|
printf("name size misstated\n");
|
1999-03-18 05:02:18 +03:00
|
|
|
return (0);
|
2000-05-23 05:48:52 +04:00
|
|
|
}
|
1999-03-18 05:02:18 +03:00
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-05-23 05:48:52 +04:00
|
|
|
direrror(ino_t ino, char *errmesg)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
|
|
|
|
fileerror(ino, ino, errmesg);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-05-23 05:48:52 +04:00
|
|
|
fileerror(ino_t cwd, ino_t ino, char *errmesg)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
register struct dinode *dp;
|
2000-05-23 05:48:52 +04:00
|
|
|
char pathbuf[MAXPATHLEN + 1];
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
pwarn("%s ", errmesg);
|
|
|
|
pinode(ino);
|
|
|
|
printf("\n");
|
|
|
|
getpathname(pathbuf, cwd, ino);
|
2000-06-14 22:43:57 +04:00
|
|
|
if (ino < ROOTINO || ino >= maxino) {
|
1999-03-18 05:02:18 +03:00
|
|
|
pfatal("NAME=%s\n", pathbuf);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
dp = ginode(ino);
|
2000-05-23 05:48:52 +04:00
|
|
|
if (dp == NULL)
|
|
|
|
pfatal("INO is NULL\n");
|
|
|
|
else {
|
|
|
|
if (ftypeok(dp))
|
|
|
|
pfatal("%s=%s\n",
|
|
|
|
(dp->di_mode & IFMT) == IFDIR ? "DIR" : "FILE", pathbuf);
|
|
|
|
else
|
|
|
|
pfatal("NAME=%s\n", pathbuf);
|
|
|
|
}
|
1999-03-18 05:02:18 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-05-23 05:48:52 +04:00
|
|
|
adjust(struct inodesc * idesc, short lcnt)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
register struct dinode *dp;
|
|
|
|
|
|
|
|
dp = ginode(idesc->id_number);
|
|
|
|
if (dp->di_nlink == lcnt) {
|
|
|
|
if (linkup(idesc->id_number, (ino_t)0) == 0)
|
|
|
|
clri(idesc, "UNREF", 0);
|
|
|
|
} else {
|
|
|
|
pwarn("LINK COUNT %s", (lfdir == idesc->id_number) ? lfname :
|
2000-05-23 05:48:52 +04:00
|
|
|
((dp->di_mode & IFMT) == IFDIR ? "DIR" : "FILE"));
|
1999-03-18 05:02:18 +03:00
|
|
|
pinode(idesc->id_number);
|
|
|
|
printf(" COUNT %d SHOULD BE %d",
|
2000-05-23 05:48:52 +04:00
|
|
|
dp->di_nlink, dp->di_nlink - lcnt);
|
1999-03-18 05:02:18 +03:00
|
|
|
if (preen) {
|
|
|
|
if (lcnt < 0) {
|
|
|
|
printf("\n");
|
|
|
|
pfatal("LINK COUNT INCREASING");
|
|
|
|
}
|
|
|
|
printf(" (ADJUSTED)\n");
|
|
|
|
}
|
|
|
|
if (preen || reply("ADJUST") == 1) {
|
|
|
|
dp->di_nlink -= lcnt;
|
|
|
|
inodirty();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2000-05-23 05:48:52 +04:00
|
|
|
mkentry(struct inodesc * idesc)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
register struct direct *dirp = idesc->id_dirp;
|
2000-05-23 05:48:52 +04:00
|
|
|
struct direct newent;
|
|
|
|
int newlen, oldlen;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
newent.d_namlen = strlen(idesc->id_name);
|
|
|
|
newlen = DIRSIZ(0, &newent, 0);
|
|
|
|
if (dirp->d_ino != 0)
|
|
|
|
oldlen = DIRSIZ(0, dirp, 0);
|
|
|
|
else
|
|
|
|
oldlen = 0;
|
|
|
|
if (dirp->d_reclen - oldlen < newlen)
|
|
|
|
return (KEEPON);
|
|
|
|
newent.d_reclen = dirp->d_reclen - oldlen;
|
|
|
|
dirp->d_reclen = oldlen;
|
|
|
|
dirp = (struct direct *)(((char *)dirp) + oldlen);
|
|
|
|
dirp->d_ino = idesc->id_parent; /* ino to be entered is in id_parent */
|
|
|
|
dirp->d_reclen = newent.d_reclen;
|
|
|
|
if (newinofmt)
|
|
|
|
dirp->d_type = typemap[idesc->id_parent];
|
|
|
|
else
|
|
|
|
dirp->d_type = 0;
|
|
|
|
dirp->d_namlen = newent.d_namlen;
|
|
|
|
memcpy(dirp->d_name, idesc->id_name, (size_t)dirp->d_namlen + 1);
|
|
|
|
# if (BYTE_ORDER == LITTLE_ENDIAN)
|
|
|
|
/*
|
2000-05-23 05:48:52 +04:00
|
|
|
* If the entry was split, dirscan()will only reverse the byte
|
|
|
|
* order of the original entry, and not the new one, before
|
|
|
|
* writing it back out. So, we reverse the byte order here if
|
|
|
|
* necessary.
|
|
|
|
*/
|
1999-03-18 05:02:18 +03:00
|
|
|
if (oldlen != 0 && !newinofmt && !doinglevel2) {
|
2000-05-23 05:48:52 +04:00
|
|
|
u_char tmp;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
tmp = dirp->d_namlen;
|
|
|
|
dirp->d_namlen = dirp->d_type;
|
|
|
|
dirp->d_type = tmp;
|
|
|
|
}
|
|
|
|
# endif
|
2000-05-23 05:48:52 +04:00
|
|
|
return (ALTERED | STOP);
|
1999-03-18 05:02:18 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2000-05-23 05:48:52 +04:00
|
|
|
chgino(struct inodesc * idesc)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
register struct direct *dirp = idesc->id_dirp;
|
|
|
|
|
|
|
|
if (memcmp(dirp->d_name, idesc->id_name, (int)dirp->d_namlen + 1))
|
|
|
|
return (KEEPON);
|
|
|
|
dirp->d_ino = idesc->id_parent;
|
|
|
|
if (newinofmt)
|
|
|
|
dirp->d_type = typemap[idesc->id_parent];
|
|
|
|
else
|
|
|
|
dirp->d_type = 0;
|
2000-05-23 05:48:52 +04:00
|
|
|
return (ALTERED | STOP);
|
1999-03-18 05:02:18 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-05-23 05:48:52 +04:00
|
|
|
linkup(ino_t orphan, ino_t parentdir)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
register struct dinode *dp;
|
2000-05-23 05:48:52 +04:00
|
|
|
int lostdir;
|
|
|
|
ino_t oldlfdir;
|
|
|
|
struct inodesc idesc;
|
|
|
|
char tempname[BUFSIZ];
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
memset(&idesc, 0, sizeof(struct inodesc));
|
|
|
|
dp = ginode(orphan);
|
|
|
|
lostdir = (dp->di_mode & IFMT) == IFDIR;
|
|
|
|
pwarn("UNREF %s ", lostdir ? "DIR" : "FILE");
|
|
|
|
pinode(orphan);
|
|
|
|
if (preen && dp->di_size == 0)
|
|
|
|
return (0);
|
|
|
|
if (preen)
|
|
|
|
printf(" (RECONNECTED)\n");
|
2000-05-23 05:48:52 +04:00
|
|
|
else if (reply("RECONNECT") == 0)
|
|
|
|
return (0);
|
1999-03-18 05:02:18 +03:00
|
|
|
if (lfdir == 0) {
|
|
|
|
dp = ginode(ROOTINO);
|
|
|
|
idesc.id_name = lfname;
|
|
|
|
idesc.id_type = DATA;
|
|
|
|
idesc.id_func = findino;
|
|
|
|
idesc.id_number = ROOTINO;
|
|
|
|
if ((ckinode(dp, &idesc) & FOUND) != 0) {
|
|
|
|
lfdir = idesc.id_parent;
|
|
|
|
} else {
|
|
|
|
pwarn("NO lost+found DIRECTORY");
|
|
|
|
if (preen || reply("CREATE")) {
|
|
|
|
lfdir = allocdir(ROOTINO, (ino_t)0, lfmode);
|
|
|
|
if (lfdir != 0) {
|
|
|
|
if (makeentry(ROOTINO, lfdir, lfname) != 0) {
|
|
|
|
if (preen)
|
|
|
|
printf(" (CREATED)\n");
|
|
|
|
} else {
|
|
|
|
freedir(lfdir, ROOTINO);
|
|
|
|
lfdir = 0;
|
|
|
|
if (preen)
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (lfdir == 0) {
|
|
|
|
pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY");
|
|
|
|
printf("\n\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
dp = ginode(lfdir);
|
|
|
|
if ((dp->di_mode & IFMT) != IFDIR) {
|
|
|
|
pfatal("lost+found IS NOT A DIRECTORY");
|
|
|
|
if (reply("REALLOCATE") == 0)
|
|
|
|
return (0);
|
|
|
|
oldlfdir = lfdir;
|
|
|
|
if ((lfdir = allocdir(ROOTINO, (ino_t)0, lfmode)) == 0) {
|
|
|
|
pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
if ((changeino(ROOTINO, lfname, lfdir) & ALTERED) == 0) {
|
|
|
|
pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
inodirty();
|
|
|
|
idesc.id_type = ADDR;
|
|
|
|
idesc.id_func = pass4check;
|
|
|
|
idesc.id_number = oldlfdir;
|
|
|
|
adjust(&idesc, lncntp[oldlfdir] + 1);
|
|
|
|
lncntp[oldlfdir] = 0;
|
|
|
|
dp = ginode(lfdir);
|
|
|
|
}
|
|
|
|
if (statemap[lfdir] != DFOUND) {
|
|
|
|
pfatal("SORRY. NO lost+found DIRECTORY\n\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
(void)lftempname(tempname, orphan);
|
|
|
|
if (makeentry(lfdir, orphan, tempname) == 0) {
|
|
|
|
pfatal("SORRY. NO SPACE IN lost+found DIRECTORY");
|
|
|
|
printf("\n\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
lncntp[orphan]--;
|
|
|
|
if (lostdir) {
|
|
|
|
if ((changeino(orphan, "..", lfdir) & ALTERED) == 0 &&
|
|
|
|
parentdir != (ino_t)-1)
|
|
|
|
(void)makeentry(orphan, lfdir, "..");
|
|
|
|
dp = ginode(lfdir);
|
|
|
|
dp->di_nlink++;
|
|
|
|
inodirty();
|
|
|
|
lncntp[lfdir]++;
|
|
|
|
pwarn("DIR I=%u CONNECTED. ", orphan);
|
|
|
|
if (parentdir != (ino_t)-1)
|
|
|
|
printf("PARENT WAS I=%u\n", parentdir);
|
|
|
|
if (preen == 0)
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* fix an entry in a directory.
|
|
|
|
*/
|
|
|
|
int
|
2000-05-23 05:48:52 +04:00
|
|
|
changeino(ino_t dir, char *name, ino_t newnum)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
2000-05-23 05:48:52 +04:00
|
|
|
struct inodesc idesc;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
memset(&idesc, 0, sizeof(struct inodesc));
|
|
|
|
idesc.id_type = DATA;
|
|
|
|
idesc.id_func = chgino;
|
|
|
|
idesc.id_number = dir;
|
|
|
|
idesc.id_fix = DONTKNOW;
|
|
|
|
idesc.id_name = name;
|
|
|
|
idesc.id_parent = newnum; /* new value for name */
|
|
|
|
return (ckinode(ginode(dir), &idesc));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* make an entry in a directory
|
|
|
|
*/
|
|
|
|
int
|
2000-05-23 05:48:52 +04:00
|
|
|
makeentry(ino_t parent, ino_t ino, char *name)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
2000-05-23 05:48:52 +04:00
|
|
|
struct dinode *dp;
|
|
|
|
struct inodesc idesc;
|
|
|
|
char pathbuf[MAXPATHLEN + 1];
|
|
|
|
|
1999-03-18 05:02:18 +03:00
|
|
|
if (parent < ROOTINO || parent >= maxino ||
|
|
|
|
ino < ROOTINO || ino >= maxino)
|
|
|
|
return (0);
|
|
|
|
memset(&idesc, 0, sizeof(struct inodesc));
|
|
|
|
idesc.id_type = DATA;
|
|
|
|
idesc.id_func = mkentry;
|
|
|
|
idesc.id_number = parent;
|
|
|
|
idesc.id_parent = ino; /* this is the inode to enter */
|
|
|
|
idesc.id_fix = DONTKNOW;
|
|
|
|
idesc.id_name = name;
|
|
|
|
dp = ginode(parent);
|
|
|
|
if (dp->di_size % DIRBLKSIZ) {
|
|
|
|
dp->di_size = roundup(dp->di_size, DIRBLKSIZ);
|
|
|
|
inodirty();
|
|
|
|
}
|
|
|
|
if ((ckinode(dp, &idesc) & ALTERED) != 0)
|
|
|
|
return (1);
|
|
|
|
getpathname(pathbuf, parent, parent);
|
|
|
|
dp = ginode(parent);
|
|
|
|
if (expanddir(dp, pathbuf) == 0)
|
|
|
|
return (0);
|
|
|
|
return (ckinode(dp, &idesc) & ALTERED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Attempt to expand the size of a directory
|
|
|
|
*/
|
|
|
|
static int
|
2000-05-23 05:48:52 +04:00
|
|
|
expanddir(struct dinode * dp, char *name)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
2000-05-23 05:48:52 +04:00
|
|
|
daddr_t lastbn, newblk;
|
1999-03-18 05:02:18 +03:00
|
|
|
register struct bufarea *bp;
|
2000-05-23 05:48:52 +04:00
|
|
|
char *cp, firstblk[DIRBLKSIZ];
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
lastbn = lblkno(&sblock, dp->di_size);
|
|
|
|
if (lastbn >= NDADDR - 1 || dp->di_db[lastbn] == 0 || dp->di_size == 0)
|
|
|
|
return (0);
|
|
|
|
if ((newblk = allocblk(sblock.lfs_frag)) == 0)
|
|
|
|
return (0);
|
|
|
|
dp->di_db[lastbn + 1] = dp->di_db[lastbn];
|
|
|
|
dp->di_db[lastbn] = newblk;
|
|
|
|
dp->di_size += sblock.lfs_bsize;
|
Merge the short-lived perseant-lfsv2 branch into the trunk.
Kernels and tools understand both v1 and v2 filesystems; newfs_lfs
generates v2 by default. Changes for the v2 layout include:
- Segments of non-PO2 size and arbitrary block offset, so these can be
matched to convenient physical characteristics of the partition (e.g.,
stripe or track size and offset).
- Address by fragment instead of by disk sector, paving the way for
non-512-byte-sector devices. In theory fragments can be as large
as you like, though in reality they must be smaller than MAXBSIZE in size.
- Use serial number and filesystem identifier to ensure that roll-forward
doesn't get old data and think it's new. Roll-forward is enabled for
v2 filesystems, though not for v1 filesystems by default.
- The inode free list is now a tailq, paving the way for undelete (undelete
is not yet implemented, but can be without further non-backwards-compatible
changes to disk structures).
- Inode atime information is kept in the Ifile, instead of on the inode;
that is, the inode is never written *just* because atime was changed.
Because of this the inodes remain near the file data on the disk, rather
than wandering all over as the disk is read repeatedly. This speeds up
repeated reads by a small but noticeable amount.
Other changes of note include:
- The ifile written by newfs_lfs can now be of arbitrary length, it is no
longer restricted to a single indirect block.
- Fixed an old bug where ctime was changed every time a vnode was created.
I need to look more closely to make sure that the times are only updated
during write(2) and friends, not after-the-fact during a segment write,
and certainly not by the cleaner.
2001-07-14 00:30:18 +04:00
|
|
|
dp->di_blocks += btofsb(&sblock, sblock.lfs_bsize);
|
|
|
|
bp = getdirblk(dp->di_db[lastbn + 1],
|
|
|
|
(long)dblksize(&sblock, dp, lastbn + 1));
|
1999-03-18 05:02:18 +03:00
|
|
|
if (bp->b_errs)
|
|
|
|
goto bad;
|
|
|
|
memcpy(firstblk, bp->b_un.b_buf, DIRBLKSIZ);
|
|
|
|
bp = getdirblk(newblk, sblock.lfs_bsize);
|
|
|
|
if (bp->b_errs)
|
|
|
|
goto bad;
|
|
|
|
memcpy(bp->b_un.b_buf, firstblk, DIRBLKSIZ);
|
|
|
|
for (cp = &bp->b_un.b_buf[DIRBLKSIZ];
|
|
|
|
cp < &bp->b_un.b_buf[sblock.lfs_bsize];
|
|
|
|
cp += DIRBLKSIZ)
|
|
|
|
memcpy(cp, &emptydir, sizeof emptydir);
|
|
|
|
dirty(bp);
|
|
|
|
bp = getdirblk(dp->di_db[lastbn + 1],
|
2000-05-23 05:48:52 +04:00
|
|
|
(long)dblksize(&sblock, dp, lastbn + 1));
|
1999-03-18 05:02:18 +03:00
|
|
|
if (bp->b_errs)
|
|
|
|
goto bad;
|
|
|
|
memcpy(bp->b_un.b_buf, &emptydir, sizeof emptydir);
|
|
|
|
pwarn("NO SPACE LEFT IN %s", name);
|
|
|
|
if (preen)
|
|
|
|
printf(" (EXPANDED)\n");
|
|
|
|
else if (reply("EXPAND") == 0)
|
|
|
|
goto bad;
|
|
|
|
dirty(bp);
|
|
|
|
inodirty();
|
|
|
|
return (1);
|
|
|
|
bad:
|
|
|
|
dp->di_db[lastbn] = dp->di_db[lastbn + 1];
|
|
|
|
dp->di_db[lastbn + 1] = 0;
|
|
|
|
dp->di_size -= sblock.lfs_bsize;
|
Merge the short-lived perseant-lfsv2 branch into the trunk.
Kernels and tools understand both v1 and v2 filesystems; newfs_lfs
generates v2 by default. Changes for the v2 layout include:
- Segments of non-PO2 size and arbitrary block offset, so these can be
matched to convenient physical characteristics of the partition (e.g.,
stripe or track size and offset).
- Address by fragment instead of by disk sector, paving the way for
non-512-byte-sector devices. In theory fragments can be as large
as you like, though in reality they must be smaller than MAXBSIZE in size.
- Use serial number and filesystem identifier to ensure that roll-forward
doesn't get old data and think it's new. Roll-forward is enabled for
v2 filesystems, though not for v1 filesystems by default.
- The inode free list is now a tailq, paving the way for undelete (undelete
is not yet implemented, but can be without further non-backwards-compatible
changes to disk structures).
- Inode atime information is kept in the Ifile, instead of on the inode;
that is, the inode is never written *just* because atime was changed.
Because of this the inodes remain near the file data on the disk, rather
than wandering all over as the disk is read repeatedly. This speeds up
repeated reads by a small but noticeable amount.
Other changes of note include:
- The ifile written by newfs_lfs can now be of arbitrary length, it is no
longer restricted to a single indirect block.
- Fixed an old bug where ctime was changed every time a vnode was created.
I need to look more closely to make sure that the times are only updated
during write(2) and friends, not after-the-fact during a segment write,
and certainly not by the cleaner.
2001-07-14 00:30:18 +04:00
|
|
|
dp->di_blocks -= btofsb(&sblock, sblock.lfs_bsize);
|
1999-03-18 05:02:18 +03:00
|
|
|
freeblk(newblk, sblock.lfs_frag);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* allocate a new directory
|
|
|
|
*/
|
|
|
|
int
|
2000-05-23 05:48:52 +04:00
|
|
|
allocdir(ino_t parent, ino_t request, int mode)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
2000-05-23 05:48:52 +04:00
|
|
|
ino_t ino;
|
|
|
|
char *cp;
|
|
|
|
struct dinode *dp;
|
1999-03-18 05:02:18 +03:00
|
|
|
register struct bufarea *bp;
|
|
|
|
struct dirtemplate *dirp;
|
|
|
|
|
2000-05-23 05:48:52 +04:00
|
|
|
ino = allocino(request, IFDIR | mode);
|
1999-03-18 05:02:18 +03:00
|
|
|
if (newinofmt)
|
|
|
|
dirp = &dirhead;
|
|
|
|
else
|
2000-05-23 05:48:52 +04:00
|
|
|
dirp = (struct dirtemplate *) & odirhead;
|
1999-03-18 05:02:18 +03:00
|
|
|
dirp->dot_ino = ino;
|
|
|
|
dirp->dotdot_ino = parent;
|
|
|
|
dp = ginode(ino);
|
|
|
|
bp = getdirblk(dp->di_db[0], sblock.lfs_fsize);
|
|
|
|
if (bp->b_errs) {
|
|
|
|
freeino(ino);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
memcpy(bp->b_un.b_buf, dirp, sizeof(struct dirtemplate));
|
|
|
|
for (cp = &bp->b_un.b_buf[DIRBLKSIZ];
|
|
|
|
cp < &bp->b_un.b_buf[sblock.lfs_fsize];
|
|
|
|
cp += DIRBLKSIZ)
|
|
|
|
memcpy(cp, &emptydir, sizeof emptydir);
|
|
|
|
dirty(bp);
|
|
|
|
dp->di_nlink = 2;
|
|
|
|
inodirty();
|
|
|
|
if (ino == ROOTINO) {
|
|
|
|
lncntp[ino] = dp->di_nlink;
|
|
|
|
cacheino(dp, ino);
|
2000-05-23 05:48:52 +04:00
|
|
|
return (ino);
|
1999-03-18 05:02:18 +03:00
|
|
|
}
|
|
|
|
if (statemap[parent] != DSTATE && statemap[parent] != DFOUND) {
|
|
|
|
freeino(ino);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
cacheino(dp, ino);
|
|
|
|
statemap[ino] = statemap[parent];
|
|
|
|
if (statemap[ino] == DSTATE) {
|
|
|
|
lncntp[ino] = dp->di_nlink;
|
|
|
|
lncntp[parent]++;
|
|
|
|
}
|
|
|
|
dp = ginode(parent);
|
|
|
|
dp->di_nlink++;
|
|
|
|
inodirty();
|
|
|
|
return (ino);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* free a directory inode
|
|
|
|
*/
|
|
|
|
static void
|
2000-05-23 05:48:52 +04:00
|
|
|
freedir(ino_t ino, ino_t parent)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
2000-05-23 05:48:52 +04:00
|
|
|
struct dinode *dp;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
if (ino != parent) {
|
|
|
|
dp = ginode(parent);
|
|
|
|
dp->di_nlink--;
|
|
|
|
inodirty();
|
|
|
|
}
|
|
|
|
freeino(ino);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* generate a temporary name for the lost+found directory.
|
|
|
|
*/
|
|
|
|
static int
|
2000-05-23 05:48:52 +04:00
|
|
|
lftempname(char *bufp, ino_t ino)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
2000-05-23 05:48:52 +04:00
|
|
|
register ino_t in;
|
|
|
|
register char *cp;
|
|
|
|
int namlen;
|
1999-03-18 05:02:18 +03:00
|
|
|
|
|
|
|
cp = bufp + 2;
|
|
|
|
for (in = maxino; in > 0; in /= 10)
|
|
|
|
cp++;
|
|
|
|
*--cp = 0;
|
|
|
|
namlen = cp - bufp;
|
|
|
|
in = ino;
|
|
|
|
while (cp > bufp) {
|
|
|
|
*--cp = (in % 10) + '0';
|
|
|
|
in /= 10;
|
|
|
|
}
|
|
|
|
*cp = '#';
|
|
|
|
return (namlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get a directory block.
|
|
|
|
* Ensure that it is held until another is requested.
|
|
|
|
*/
|
|
|
|
static struct bufarea *
|
2000-05-23 05:48:52 +04:00
|
|
|
getdirblk(daddr_t blkno, long size)
|
1999-03-18 05:02:18 +03:00
|
|
|
{
|
|
|
|
|
|
|
|
if (pdirbp != 0)
|
|
|
|
pdirbp->b_flags &= ~B_INUSE;
|
|
|
|
/* pdirbp = getdatablk(blkno, size); */
|
2000-05-23 05:48:52 +04:00
|
|
|
pdirbp = getddblk(blkno, size);
|
1999-03-18 05:02:18 +03:00
|
|
|
return (pdirbp);
|
|
|
|
}
|