mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-18 15:30:21 +00:00
Code Issues Releases Activity

Garbage collect 'fflags'.

Browse Source
This commit is contained in:
David E. O'Brien 2008-12-24 03:07:19 +00:00
parent ee6326a30b
commit defc9d504b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=186471
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/fsck_ffs/main.c
View File

@ -206,7 +206,6 @@ checkfilesys(char *filesys)
struct iovec *iov;
char errmsg[255];
int iovlen;
int fflags;
int cylno;
ino_t files;
size_t size;
@ -343,7 +342,6 @@ checkfilesys(char *filesys)
if (bkgrdflag) {
snprintf(snapname, sizeof snapname,
"%s/.snap/fsck_snapshot", mntp->f_mntonname);
fflags = mntp->f_flags;
build_iovec(&iov, &iovlen, "fstype", "ffs", 4);
build_iovec(&iov, &iovlen, "from", snapname,
(size_t)-1);
@ -354,7 +352,7 @@ checkfilesys(char *filesys)
build_iovec(&iov, &iovlen, "update", NULL, 0);
build_iovec(&iov, &iovlen, "snapshot", NULL, 0);
while (nmount(iov, iovlen, fflags) < 0) {
while (nmount(iov, iovlen, mntp->f_flags) < 0) {
if (errno == EEXIST && unlink(snapname) == 0)
continue;
bkgrdflag = 0;
@ -522,7 +520,6 @@ chkdoreload(struct statfs *mntp)
{
struct iovec *iov;
int iovlen;
int fflags;
char errmsg[255];
if (mntp == NULL)
@ -531,7 +528,6 @@ chkdoreload(struct statfs *mntp)
iov = NULL;
iovlen = 0;
errmsg[0] = '\0';
fflags = mntp->f_flags;
/*
* We modified a mounted file system. Do a mount update on
* it unless it is read-write, so we can continue using it
@ -552,7 +548,7 @@ chkdoreload(struct statfs *mntp)
* nmount parsing of root mounts and NFS root mounts.
*/
build_iovec(&iov, &iovlen, "ro", NULL, 0);
if (nmount(iov, iovlen, fflags) == 0) {
if (nmount(iov, iovlen, mntp->f_flags) == 0) {
return (0);
}
pwarn("mount reload of '%s' failed: %s %s\n\n",