d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Open the device read-only initially and re-open read-write if necessary

Browse Source 
later.  This allows tunefs -p on mounted filesystems.

Side-effects:
	Use K&R prototypes.
	Use definitions from fcntl.h for the flags argument to open(2).

There are cosmetic differences between this and the submitted patch.

PR:		17143
Reported by:	Peter Edwards <peter.edwards@ireland.com>
Submitted by:	luoqi
This commit is contained in:
Sheldon Hearn 2000-03-14 07:44:32 +00:00
parent 2a30e2ac0b
commit 060ac658cc
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sbin/tunefs/tunefs.c
View File

@ -61,6 +61,7 @@ static const char rcsid[] =
#include <paths.h> #include <paths.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
/* the optimization warning string template */ /* the optimization warning string template */
@ -75,9 +76,10 @@ union {
int fi; int fi;
long dev_bsize = 1; long dev_bsize = 1;
void bwrite(daddr_t, char *, int); void bwrite __P((daddr_t, char *, int));
int bread(daddr_t, char *, int); int bread __P((daddr_t, char *, int));
void getsb(struct fs *, char *); void getsb __P((struct fs *, char *));
void putsb __P((struct fs *, char *, int));
void usage __P((void)); void usage __P((void));
void printfs __P((void)); void printfs __P((void));
@ -103,9 +105,6 @@ main(argc, argv)
if (fs) { if (fs) {
if (statfs(special, &stfs) == 0 && if (statfs(special, &stfs) == 0 &&
strcmp(special, stfs.f_mntonname) == 0) { strcmp(special, stfs.f_mntonname) == 0) {
if ((stfs.f_flags & MNT_RDONLY) == 0) {
errx(1, "cannot work on read-write mounted file system");
}
active = 1; active = 1;
} }
special = fs->fs_spec; special = fs->fs_spec;
@ -251,12 +250,7 @@ again:
} }
if (argc != 1) if (argc != 1)
usage(); usage();
bwrite((daddr_t)SBOFF / dev_bsize, (char *)&sblock, SBSIZE); putsb(&sblock, special, Aflag);
if (Aflag)
for (i = 0; i < sblock.fs_ncg; i++)
bwrite(fsbtodb(&sblock, cgsblock(&sblock, i)),
(char *)&sblock, SBSIZE);
close(fi);
if (active) { if (active) {
bzero(&args, sizeof(args)); bzero(&args, sizeof(args));
if (mount("ufs", fs->fs_file, if (mount("ufs", fs->fs_file,
@ -283,7 +277,7 @@ getsb(fs, file)
char *file; char *file;
{ {
fi = open(file, 2); fi = open(file, O_RDONLY);
if (fi < 0) if (fi < 0)
err(3, "cannot open %s", file); err(3, "cannot open %s", file);
if (bread((daddr_t)SBOFF, (char *)fs, SBSIZE)) if (bread((daddr_t)SBOFF, (char *)fs, SBSIZE))
@ -293,6 +287,32 @@ getsb(fs, file)
dev_bsize = fs->fs_fsize / fsbtodb(fs, 1); dev_bsize = fs->fs_fsize / fsbtodb(fs, 1);
} }
void
putsb(fs, file, all)
register struct fs *fs;
char *file;
int all;
{
int i;
/*
* Re-open the device read-write. Use the read-only file
* descriptor as an interlock to prevent the device from
* being mounted while we are switching mode.
*/
i = fi;
fi = open(file, O_RDWR);
close(i);
if (fi < 0)
err(3, "cannot open %s", file);
bwrite((daddr_t)SBOFF / dev_bsize, (char *)fs, SBSIZE);
if (all)
for (i = 0; i < fs->fs_ncg; i++)
bwrite(fsbtodb(fs, cgsblock(fs, i)),
(char *)fs, SBSIZE);
close(fi);
}
void void
printfs() printfs()
{ {