diff options
| author | phk <phk@FreeBSD.org> | 2004-11-09 22:21:52 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-11-09 22:21:52 +0000 |
| commit | 5eae02ee768f29a7e1870dd3077e3035bd7198a3 (patch) | |
| tree | 4e88184008674f369af359880adf177d32de4950 /sys | |
| parent | 37ad4f1923f750790407861ce00a1e96c5f1b0be (diff) | |
| download | FreeBSD-src-5eae02ee768f29a7e1870dd3077e3035bd7198a3.zip FreeBSD-src-5eae02ee768f29a7e1870dd3077e3035bd7198a3.tar.gz | |
Detect root mount attempts on the flag, not on the NULL path.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/fs/ntfs/ntfs_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index e998f61..9500695 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -201,7 +201,7 @@ cd9660_omount(mp, path, data, td) struct iso_mnt *imp = 0; struct nameidata ndp; - if (path == NULL) /* We are doing the initial root mount */ + if (mp->mnt_flag & MNT_ROOTFS) return (iso_mountroot(mp, td)); if ((error = copyin(data, (caddr_t)&args, sizeof (struct iso_args)))) return (error); diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index 975fdea..684fb8c 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/sys/fs/ntfs/ntfs_vfsops.c @@ -114,7 +114,7 @@ ntfs_omount ( /* * Use NULL path to flag a root mount */ - if( path == NULL) { + if (mp->mnt_flag & MNT_ROOTFS) { /* *** * Mounting root filesystem diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index e998f61..9500695 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -201,7 +201,7 @@ cd9660_omount(mp, path, data, td) struct iso_mnt *imp = 0; struct nameidata ndp; - if (path == NULL) /* We are doing the initial root mount */ + if (mp->mnt_flag & MNT_ROOTFS) return (iso_mountroot(mp, td)); if ((error = copyin(data, (caddr_t)&args, sizeof (struct iso_args)))) return (error); diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 6cbe859..bde4c23 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -678,7 +678,7 @@ nfs_omount(struct mount *mp, char *path, caddr_t data, struct thread *td) size_t len; u_char nfh[NFSX_V3FHMAX]; - if (path == NULL) + if (mp->mnt_flag & MNT_ROOTFS) return (nfs_mountroot(mp, td)); error = copyin(data, (caddr_t)&args, sizeof (struct nfs_args)); if (error) |
