freebsd-skq/sbin/fsck/preen.c
phk c59a8fb48c This change sanitizes the way fsck deals with pass numbers.
Consider this /etc/fstab:

# Device         Mountpoint      FStype  Options    Dump    Pass#
/dev/ad1s1b      none            swap    sw         0       0
/dev/ad0s1b      none            swap    sw         0       0
/dev/ad0s1a      /               ufs     rw         1       1
/dev/ad0s1e      /home           ufs     rw         2       2
/dev/ad1s1e      /tmp            ufs     rw         2       2
/dev/ad1s1f      /usr            ufs     rw         2       2
/dev/ccd0c       /syv            ufs     rw         2       11
proc             /proc           procfs  rw         0       0

ccd0c is striped over /dev/ad0f and /dev/ad1g

Without this pass, fsck in preen mode will check ad0s1a first,
and then issue three processes in parallel:

One process doing ad0s1e
One process doing ad1s1e and ad1s1f
One process doing ccd0c

There is no way to tell it that ccd0c overlaps ad0 and ad1.

With the patch, it will do it this way:

pass 2:
One process doing ad0s1e
One process doing ad1s1e and ad1s1f

and when they are complete:

pass 11:
One process doing ccd0c

This is much faster and more sane.

Valid pass numbers are anything from 1 to INTMAX-1.

I retired the '-l' option which tried to allow people to do
something like this, but which didn't work and which complicated
the code an awful lot.
2001-03-30 08:01:34 +00:00

346 lines
8.2 KiB
C

/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */
/*
* Copyright (c) 1990, 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.
*
* $FreeBSD$
*/
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)preen.c 8.5 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $");
#endif
#endif /* not lint */
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/queue.h>
#include <err.h>
#include <ctype.h>
#include <fstab.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "fsutil.h"
struct partentry {
TAILQ_ENTRY(partentry) p_entries;
char *p_devname; /* device name */
char *p_mntpt; /* mount point */
char *p_type; /* filesystem type */
void *p_auxarg; /* auxiliary argument */
};
TAILQ_HEAD(part, partentry) badh;
struct diskentry {
TAILQ_ENTRY(diskentry) d_entries;
char *d_name; /* disk base name */
TAILQ_HEAD(prt, partentry) d_part; /* list of partitions on disk */
int d_pid; /* 0 or pid of fsck proc */
};
TAILQ_HEAD(disk, diskentry) diskh;
static int nrun = 0, ndisks = 0;
static struct diskentry *finddisk __P((const char *));
static void addpart __P((const char *, const char *, const char *, void *));
static int startdisk __P((struct diskentry *,
int (*)(const char *, const char *, const char *, void *, pid_t *)));
static void printpart __P((void));
int
checkfstab(flags, docheck, checkit)
int flags;
void *(*docheck) __P((struct fstab *));
int (*checkit) __P((const char *, const char *, const char *, void *,
pid_t *));
{
struct fstab *fs;
struct diskentry *d, *nextdisk;
struct partentry *p;
int ret, pid, retcode, passno, sumstatus, status, nextpass;
void *auxarg;
const char *name;
TAILQ_INIT(&badh);
TAILQ_INIT(&diskh);
sumstatus = 0;
nextpass = 0;
for (passno = 1; nextpass != INT_MAX; passno = nextpass) {
if (flags & CHECK_DEBUG)
printf("pass %d\n", passno);
nextpass = INT_MAX;
if (setfsent() == 0) {
warnx("Can't open checklist file: %s\n", _PATH_FSTAB);
return (8);
}
while ((fs = getfsent()) != 0) {
if ((auxarg = (*docheck)(fs)) == NULL)
continue;
name = fs->fs_spec;
if (fs->fs_passno > passno && fs->fs_passno < nextpass)
nextpass = fs->fs_passno;
if (passno != fs->fs_passno)
continue;
if (flags & CHECK_DEBUG)
printf("pass %d, name %s\n", passno, name);
if ((flags & CHECK_PREEN) == 0 || passno == 1) {
if (name == NULL) {
if (flags & CHECK_PREEN)
return 8;
else
continue;
}
sumstatus = (*checkit)(fs->fs_vfstype,
name, fs->fs_file, auxarg, NULL);
if (sumstatus)
return (sumstatus);
continue;
}
if (name == NULL) {
(void) fprintf(stderr,
"BAD DISK NAME %s\n", fs->fs_spec);
sumstatus |= 8;
continue;
}
addpart(fs->fs_vfstype, name, fs->fs_file,
auxarg);
}
if ((flags & CHECK_PREEN) == 0 || passno == 1)
continue;
if (flags & CHECK_DEBUG) {
printf("Parallel start\n");
printpart();
}
TAILQ_FOREACH(nextdisk, &diskh, d_entries) {
if ((ret = startdisk(nextdisk, checkit)) != 0)
return ret;
}
if (flags & CHECK_DEBUG)
printf("Parallel wait\n");
while ((pid = wait(&status)) != -1) {
TAILQ_FOREACH(d, &diskh, d_entries)
if (d->d_pid == pid)
break;
if (d == NULL) {
warnx("Unknown pid %d\n", pid);
continue;
}
if (WIFEXITED(status))
retcode = WEXITSTATUS(status);
else
retcode = 0;
p = TAILQ_FIRST(&d->d_part);
if (flags & (CHECK_DEBUG|CHECK_VERBOSE))
(void) printf("done %s: %s (%s) = 0x%x\n",
p->p_type, p->p_devname, p->p_mntpt,
status);
if (WIFSIGNALED(status)) {
(void) fprintf(stderr,
"%s: %s (%s): EXITED WITH SIGNAL %d\n",
p->p_type, p->p_devname, p->p_mntpt,
WTERMSIG(status));
retcode = 8;
}
TAILQ_REMOVE(&d->d_part, p, p_entries);
if (retcode != 0) {
TAILQ_INSERT_TAIL(&badh, p, p_entries);
sumstatus |= retcode;
} else {
free(p->p_type);
free(p->p_devname);
free(p);
}
d->d_pid = 0;
nrun--;
if (TAILQ_EMPTY(&d->d_part)) {
TAILQ_REMOVE(&diskh, d, d_entries);
ndisks--;
}
}
if (flags & CHECK_DEBUG) {
printf("Parallel end\n");
printpart();
}
}
if (!(flags & CHECK_PREEN))
return 0;
if (sumstatus) {
p = TAILQ_FIRST(&badh);
if (p == NULL)
return (sumstatus);
(void) fprintf(stderr,
"THE FOLLOWING FILE SYSTEM%s HAD AN %s\n\t",
TAILQ_NEXT(p, p_entries) ? "S" : "",
"UNEXPECTED INCONSISTENCY:");
for (; p; p = TAILQ_NEXT(p, p_entries))
(void) fprintf(stderr,
"%s: %s (%s)%s", p->p_type, p->p_devname,
p->p_mntpt, TAILQ_NEXT(p, p_entries) ? ", " : "\n");
return sumstatus;
}
(void) endfsent();
return (0);
}
static struct diskentry *
finddisk(name)
const char *name;
{
const char *p;
size_t len = 0;
struct diskentry *d;
p = strrchr(name, '/');
if (p == NULL)
p = name;
else
p++;
for (; *p && !isdigit(*p); p++)
continue;
for (; *p && isdigit(*p); p++)
continue;
len = p - name;
if (len == 0)
len = strlen(name);
TAILQ_FOREACH(d, &diskh, d_entries)
if (strncmp(d->d_name, name, len) == 0 && d->d_name[len] == 0)
return d;
d = emalloc(sizeof(*d));
d->d_name = estrdup(name);
d->d_name[len] = '\0';
TAILQ_INIT(&d->d_part);
d->d_pid = 0;
TAILQ_INSERT_TAIL(&diskh, d, d_entries);
ndisks++;
return d;
}
static void
printpart()
{
struct diskentry *d;
struct partentry *p;
TAILQ_FOREACH(d, &diskh, d_entries) {
(void) printf("disk %s: ", d->d_name);
TAILQ_FOREACH(p, &d->d_part, p_entries)
(void) printf("%s ", p->p_devname);
(void) printf("\n");
}
}
static void
addpart(type, devname, mntpt, auxarg)
const char *type, *devname, *mntpt;
void *auxarg;
{
struct diskentry *d = finddisk(devname);
struct partentry *p;
TAILQ_FOREACH(p, &d->d_part, p_entries)
if (strcmp(p->p_devname, devname) == 0) {
warnx("%s in fstab more than once!\n", devname);
return;
}
p = emalloc(sizeof(*p));
p->p_devname = estrdup(devname);
p->p_mntpt = estrdup(mntpt);
p->p_type = estrdup(type);
p->p_auxarg = auxarg;
TAILQ_INSERT_TAIL(&d->d_part, p, p_entries);
}
static int
startdisk(d, checkit)
struct diskentry *d;
int (*checkit) __P((const char *, const char *, const char *, void *,
pid_t *));
{
struct partentry *p = TAILQ_FIRST(&d->d_part);
int rv;
while ((rv = (*checkit)(p->p_type, p->p_devname, p->p_mntpt,
p->p_auxarg, &d->d_pid)) != 0 && nrun > 0)
sleep(10);
if (rv == 0)
nrun++;
return rv;
}