diff options
| author | asomers <asomers@FreeBSD.org> | 2016-10-21 18:57:58 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2016-10-21 18:57:58 +0000 |
| commit | 8c973e7e7a98f6d24f39ddcfacb75f8b0523e7a9 (patch) | |
| tree | b14e1d58eaa1b9b48dddacda574389ee6c06a469 /sys | |
| parent | c2f9073bfbd37a2aa547c38777209c5cd2a929b1 (diff) | |
| download | FreeBSD-src-8c973e7e7a98f6d24f39ddcfacb75f8b0523e7a9.zip FreeBSD-src-8c973e7e7a98f6d24f39ddcfacb75f8b0523e7a9.tar.gz | |
MFC r306276, but don't remove findwin95
Mount msdosfs with longnames support by default.
The old behavior depended on the FAT version and on what files were in the
root directory. "mount_msdosfs -o shortnames" is still supported.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fs/msdosfs/msdosfs_vfsops.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 63d60dd..9b42b20 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -175,24 +175,8 @@ update_mp(struct mount *mp, struct thread *td) if (pmp->pm_flags & MSDOSFSMNT_NOWIN95) pmp->pm_flags |= MSDOSFSMNT_SHORTNAME; - else if (!(pmp->pm_flags & - (MSDOSFSMNT_SHORTNAME | MSDOSFSMNT_LONGNAME))) { - struct vnode *rootvp; - - /* - * Try to divine whether to support Win'95 long filenames - */ - if (FAT32(pmp)) - pmp->pm_flags |= MSDOSFSMNT_LONGNAME; - else { - if ((error = - msdosfs_root(mp, LK_EXCLUSIVE, &rootvp)) != 0) - return error; - pmp->pm_flags |= findwin95(VTODE(rootvp)) ? - MSDOSFSMNT_LONGNAME : MSDOSFSMNT_SHORTNAME; - vput(rootvp); - } - } + else + pmp->pm_flags |= MSDOSFSMNT_LONGNAME; return 0; } |
