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

Slightly change the way we pass mount options to the filesystem

Browse Source 
VFS_NMOUNT operations.

Reviewed by:	phk
This commit is contained in:
mux 2002-05-23 23:02:19 +00:00
parent 617cfa745a
commit 67080508a8
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/vfs_extattr.c
View File

@ -434,7 +434,6 @@ vfs_nmount(td, fsflags, fsoptions)
mp->mnt_flag |= fsflags &
(MNT_RELOAD | MNT_FORCE | MNT_UPDATE | MNT_SNAPSHOT);
VOP_UNLOCK(vp, 0, td);
mp->mnt_optnew = optlist;
goto update;
}
/*
@ -528,8 +527,8 @@ vfs_nmount(td, fsflags, fsoptions)
mp->mnt_iosize_max = DFLTPHYS;
VOP_UNLOCK(vp, 0, td);
mp->mnt_opt = optlist;
update:
mp->mnt_optnew = optlist;
/*
* Check if the fs implements the new VFS_NMOUNT()
* function, since the new system call was used.
@ -567,6 +566,17 @@ vfs_nmount(td, fsflags, fsoptions)
* get. No freeing of cn_pnbuf.
*/
error = VFS_NMOUNT(mp, &nd, td);
if (!error) {
if (mp->mnt_opt != NULL)
vfs_freeopts(mp->mnt_opt);
mp->mnt_opt = mp->mnt_optnew;
} else
vfs_freeopts(mp->mnt_optnew);
/*
* Prevent external consumers of mount
* options to read mnt_optnew.
*/
mp->mnt_optnew = NULL;
if (mp->mnt_flag & MNT_UPDATE) {
if (mp->mnt_kern_flag & MNTK_WANTRDWR)
mp->mnt_flag &= ~MNT_RDONLY;
@ -576,10 +586,6 @@ vfs_nmount(td, fsflags, fsoptions)
if (error) {
mp->mnt_flag = flag;
mp->mnt_kern_flag = kern_flag;
vfs_freeopts(mp->mnt_optnew);
} else {
vfs_freeopts(mp->mnt_opt);
mp->mnt_opt = mp->mnt_optnew;
}
if ((mp->mnt_flag & MNT_RDONLY) == 0) {
if (mp->mnt_syncer == NULL)

18
sys/kern/vfs_syscalls.c
View File

@ -434,7 +434,6 @@ vfs_nmount(td, fsflags, fsoptions)
mp->mnt_flag |= fsflags &
(MNT_RELOAD | MNT_FORCE | MNT_UPDATE | MNT_SNAPSHOT);
VOP_UNLOCK(vp, 0, td);
mp->mnt_optnew = optlist;
goto update;
}
/*
@ -528,8 +527,8 @@ vfs_nmount(td, fsflags, fsoptions)
mp->mnt_iosize_max = DFLTPHYS;
VOP_UNLOCK(vp, 0, td);
mp->mnt_opt = optlist;
update:
mp->mnt_optnew = optlist;
/*
* Check if the fs implements the new VFS_NMOUNT()
* function, since the new system call was used.
@ -567,6 +566,17 @@ vfs_nmount(td, fsflags, fsoptions)
* get. No freeing of cn_pnbuf.
*/
error = VFS_NMOUNT(mp, &nd, td);
if (!error) {
if (mp->mnt_opt != NULL)
vfs_freeopts(mp->mnt_opt);
mp->mnt_opt = mp->mnt_optnew;
} else
vfs_freeopts(mp->mnt_optnew);
/*
* Prevent external consumers of mount
* options to read mnt_optnew.
*/
mp->mnt_optnew = NULL;
if (mp->mnt_flag & MNT_UPDATE) {
if (mp->mnt_kern_flag & MNTK_WANTRDWR)
mp->mnt_flag &= ~MNT_RDONLY;
@ -576,10 +586,6 @@ vfs_nmount(td, fsflags, fsoptions)
if (error) {
mp->mnt_flag = flag;
mp->mnt_kern_flag = kern_flag;
vfs_freeopts(mp->mnt_optnew);
} else {
vfs_freeopts(mp->mnt_opt);
mp->mnt_opt = mp->mnt_optnew;
}
if ((mp->mnt_flag & MNT_RDONLY) == 0) {
if (mp->mnt_syncer == NULL)