summaryrefslogtreecommitdiffstats
path: root/sbin/mount
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2012-10-18 12:04:56 +0000
committerattilio <attilio@FreeBSD.org>2012-10-18 12:04:56 +0000
commit65d8b7120dda17d3319b5cb108caf8e3596f905f (patch)
treebd8beba1f741059b6d9618b1d3ae6b157a5183c3 /sbin/mount
parent79873f5916d43087246ed5b95823cc20014e07a4 (diff)
downloadFreeBSD-src-65d8b7120dda17d3319b5cb108caf8e3596f905f.zip
FreeBSD-src-65d8b7120dda17d3319b5cb108caf8e3596f905f.tar.gz
Disconnect non-MPSAFE SMBFS from the build in preparation for dropping
GIANT from VFS. In addition, disconnect also netsmb, which is a base requirement for SMBFS. In the while SMBFS regular users can use FUSE interface and smbnetfs port to work with their SMBFS partitions. Also, there are ongoing efforts by vendor to support in-kernel smbfs, so there are good chances that it will get relinked once properly locked. This is not targeted for MFC.
Diffstat (limited to 'sbin/mount')
-rw-r--r--sbin/mount/mount.82
-rw-r--r--sbin/mount/mount.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index cda2f4c..6bc4b5c 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -448,7 +448,6 @@ However, for the following file system types:
.Cm nfs ,
.Cm nullfs ,
.Cm oldnfs ,
-.Cm smbfs ,
.Cm udf ,
and
.Cm unionfs .
@@ -543,7 +542,6 @@ support for a particular file system might be provided either on a static
.Xr mount_msdosfs 8 ,
.Xr mount_nfs 8 ,
.Xr mount_nullfs 8 ,
-.Xr mount_smbfs 8 ,
.Xr mount_udf 8 ,
.Xr mount_unionfs 8 ,
.Xr umount 8 ,
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index a69c673..1984eac 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -143,7 +143,7 @@ use_mountprog(const char *vfstype)
unsigned int i;
const char *fs[] = {
"cd9660", "mfs", "msdosfs", "nfs",
- "nullfs", "oldnfs", "smbfs", "udf", "unionfs",
+ "nullfs", "oldnfs", "udf", "unionfs",
NULL
};
OpenPOWER on IntegriCloud