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

Remove hacks which filter out MNT_ROOTFS.

Browse Source 
They are no longer needed now that we filter out MNT_ROOTFS
inside the nmount() call in revision 1.267 of vfs_mount.c.

Reviewed by:	rink
This commit is contained in:
rodrigc 2008-03-05 07:55:07 +00:00
parent 1efa6566c1
commit 7b00b88e8b
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.sbin/mountd/mountd.c
View File

@ -1432,15 +1432,6 @@ get_exportlist()
iov[5].iov_base = fsp->f_mntfromname;
iov[5].iov_len = strlen(fsp->f_mntfromname) + 1;
/*
* Kick out MNT_ROOTFS. It should not be passed from
* userland to kernel. It should only be used
* internally in the kernel.
*/
if (fsp->f_flags & MNT_ROOTFS) {
fsp->f_flags &= ~MNT_ROOTFS;
}
if (nmount(iov, iovlen, fsp->f_flags) < 0 &&
errno != ENOENT && errno != ENOTSUP) {
syslog(LOG_ERR,
@ -2107,12 +2098,7 @@ do_mount(struct exportlist *ep, struct grouplist *grp, int exflags,
iov[5].iov_base = fsb->f_mntfromname; /* "from" */
iov[5].iov_len = strlen(fsb->f_mntfromname) + 1;
/*
* Remount the filesystem, but chop off the MNT_ROOTFS flag
* as it is used internally (and will result in an error if
* specified)
*/
while (nmount(iov, iovlen, fsb->f_flags & ~MNT_ROOTFS) < 0) {
while (nmount(iov, iovlen, fsb->f_flags) < 0) {
if (cp)
*cp-- = savedc;
else