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

Backout my changes to disallow "mount /mnt /mnt" until I can verify

Browse Source 
that nfs mounts work again (I locked up my home machine testing it and can't
see what happened until I get home from work tonight).
This commit is contained in:
mpp 1996-03-11 20:01:17 +00:00
parent d36558a005
commit f2df29a106
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sbin/mount/mount.c
View File

@ -262,7 +262,6 @@ mountfs(vfstype, spec, name, flags, options, mntopts)
pid_t pid;
int argc, i, status;
char *optbuf, execname[MAXPATHLEN + 1], mntpath[MAXPATHLEN];
char specpath[MAXPATHLEN];
if (realpath(name, mntpath) != NULL && stat(mntpath, &sb) == 0) {
if (!S_ISDIR(sb.st_mode)) {
@ -274,27 +273,6 @@ mountfs(vfstype, spec, name, flags, options, mntopts)
return (1);
}
/*
* The following check is a kludge to prevent the caller from
* accidently using the file as the special device file and
* the mount point. This will cause a panic due to a recursive
* vnode lock. After some of the planned reworking of the
* file system code is done, the kernel can be fixed properly
* and this stupid check can be removed.
*/
if (realpath(spec, specpath) == NULL) {
warn("%s", specpath);
return (1);
}
if (strcmp(vfstype, "ufs") == 0 || strcmp(vfstype, "msdos") == 0 ||
strcmp(vfstype, "cd9660") == 0) {
if (strcmp(mntpath, specpath) == 0) {
warnx("%s: Special device file and mount point may not be the same",
specpath);
return (1);
}
}
if (mntopts == NULL)
mntopts = "";

22
sbin/mount_ifs/mount.c
View File

@ -262,7 +262,6 @@ mountfs(vfstype, spec, name, flags, options, mntopts)
pid_t pid;
int argc, i, status;
char *optbuf, execname[MAXPATHLEN + 1], mntpath[MAXPATHLEN];
char specpath[MAXPATHLEN];
if (realpath(name, mntpath) != NULL && stat(mntpath, &sb) == 0) {
if (!S_ISDIR(sb.st_mode)) {
@ -274,27 +273,6 @@ mountfs(vfstype, spec, name, flags, options, mntopts)
return (1);
}
/*
* The following check is a kludge to prevent the caller from
* accidently using the file as the special device file and
* the mount point. This will cause a panic due to a recursive
* vnode lock. After some of the planned reworking of the
* file system code is done, the kernel can be fixed properly
* and this stupid check can be removed.
*/
if (realpath(spec, specpath) == NULL) {
warn("%s", specpath);
return (1);
}
if (strcmp(vfstype, "ufs") == 0 || strcmp(vfstype, "msdos") == 0 ||
strcmp(vfstype, "cd9660") == 0) {
if (strcmp(mntpath, specpath) == 0) {
warnx("%s: Special device file and mount point may not be the same",
specpath);
return (1);
}
}
if (mntopts == NULL)
mntopts = "";