summaryrefslogtreecommitdiffstats
path: root/sys/fs/smbfs
diff options
context:
space:
mode:
authoravatar <avatar@FreeBSD.org>2005-12-05 19:05:06 +0000
committeravatar <avatar@FreeBSD.org>2005-12-05 19:05:06 +0000
commit257abc1fc19ce02c432c0baa7af260a50a02dfe3 (patch)
treeb369c845f3c57f72c0b8111f0746728afa9cd4f3 /sys/fs/smbfs
parent2de362e3122301b79b03099731cc2a71b3456255 (diff)
downloadFreeBSD-src-257abc1fc19ce02c432c0baa7af260a50a02dfe3.zip
FreeBSD-src-257abc1fc19ce02c432c0baa7af260a50a02dfe3.tar.gz
Recent nmount(2) adoption in mount_smbfs(8) did not flag the "long" option
since mount_smbfs(8) assumed long name mounting by default unless "-n long" was explicitly specified. Rather than supplying a "long" option in mount_smbfs(8), this commit brings back the original behaviour by associating SMBFS_MOUNT_NO_LONG with the "nolong" option. This should fix the broken long file names on smbfs people observed recently. Reported by: Vladimir Grebenschikov <vova at fbsd dot ru> Reviewed by: phk Tested by: Slawa Olhovchenkov <slw at zxy dot spb dot ru>
Diffstat (limited to 'sys/fs/smbfs')
-rw-r--r--sys/fs/smbfs/smbfs_vfsops.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c
index f8ddd42..aa9a8e1 100644
--- a/sys/fs/smbfs/smbfs_vfsops.c
+++ b/sys/fs/smbfs/smbfs_vfsops.c
@@ -230,9 +230,7 @@ smbfs_mount(struct mount *mp, struct thread *td)
smp->sm_dir_mode = (v & (S_IRWXU|S_IRWXG|S_IRWXO)) | S_IFDIR;
vfs_flagopt(mp->mnt_optnew,
- "long", &smp->sm_flags, SMBFS_MOUNT_NO_LONG);
-
- smp->sm_flags ^= SMBFS_MOUNT_NO_LONG;
+ "nolong", &smp->sm_flags, SMBFS_MOUNT_NO_LONG);
/* simple_lock_init(&smp->sm_npslock);*/
pc = mp->mnt_stat.f_mntfromname;
OpenPOWER on IntegriCloud