View | Details | Raw Unified | Return to bug 238579 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/fs/msdosfs/msdosfs_vfsops.c (-9 / +8 lines)
Lines 163-176 update_mp(struct mount *mp, struct thread *td) Link Here
163
		pmp->pm_mask = v & ALLPERMS;
163
		pmp->pm_mask = v & ALLPERMS;
164
	if (vfs_scanopt(mp->mnt_optnew, "dirmask", "%d", &v) == 1)
164
	if (vfs_scanopt(mp->mnt_optnew, "dirmask", "%d", &v) == 1)
165
		pmp->pm_dirmask = v & ALLPERMS;
165
		pmp->pm_dirmask = v & ALLPERMS;
166
	vfs_flagopt(mp->mnt_optnew, "shortname",
166
	if (!vfs_flagopt(mp->mnt_optnew, "shortname",
167
	    &pmp->pm_flags, MSDOSFSMNT_SHORTNAME);
167
		 &pmp->pm_flags, MSDOSFSMNT_SHORTNAME))
168
	vfs_flagopt(mp->mnt_optnew, "shortnames",
168
		vfs_flagopt(mp->mnt_optnew, "shortnames",
169
	    &pmp->pm_flags, MSDOSFSMNT_SHORTNAME);
169
		    &pmp->pm_flags, MSDOSFSMNT_SHORTNAME);
170
	vfs_flagopt(mp->mnt_optnew, "longname",
170
	if (!vfs_flagopt(mp->mnt_optnew, "longname",
171
	    &pmp->pm_flags, MSDOSFSMNT_LONGNAME);
171
		 &pmp->pm_flags, MSDOSFSMNT_LONGNAME))
172
	vfs_flagopt(mp->mnt_optnew, "longnames",
172
		vfs_flagopt(mp->mnt_optnew, "longnames",
173
	    &pmp->pm_flags, MSDOSFSMNT_LONGNAME);
173
		    &pmp->pm_flags, MSDOSFSMNT_LONGNAME);
174
	vfs_flagopt(mp->mnt_optnew, "kiconv",
174
	vfs_flagopt(mp->mnt_optnew, "kiconv",
175
	    &pmp->pm_flags, MSDOSFSMNT_KICONV);
175
	    &pmp->pm_flags, MSDOSFSMNT_KICONV);
176
176
177
- 

Return to bug 238579