summaryrefslogtreecommitdiffstats
path: root/sys/msdosfs/msdosfs_vnops.c
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2015-10-23 18:04:37 +0000
committerkrw <krw@openbsd.org>2015-10-23 18:04:37 +0000
commite53dbe28769263885545a00f796036c2fe109f9d (patch)
treeefb29d814095ed6837f92eb52b198334b0afc210 /sys/msdosfs/msdosfs_vnops.c
parentRemove three strange and unused preproc defines. Submitted by Ilya (diff)
downloadwireguard-openbsd-e53dbe28769263885545a00f796036c2fe109f9d.tar.xz
wireguard-openbsd-e53dbe28769263885545a00f796036c2fe109f9d.zip
Fix renaming in the root directory by correctly setting directory
offset. From Serguey Parkhomovsky via bugs@, in response to problem report from matthieu@. Same fix is in NetBSD for one. ok tedu@
Diffstat (limited to 'sys/msdosfs/msdosfs_vnops.c')
-rw-r--r--sys/msdosfs/msdosfs_vnops.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 55e50c259ca..d042cb13e56 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_vnops.c,v 1.103 2015/10/23 17:21:34 krw Exp $ */
+/* $OpenBSD: msdosfs_vnops.c,v 1.104 2015/10/23 18:04:37 krw Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */
/*-
@@ -1191,8 +1191,9 @@ abortit:
VOP_UNLOCK(fdvp, 0, p);
goto bad;
}
+ ip->de_diroffset = to_diroffset;
if (ip->de_dirclust != MSDOSFSROOT)
- ip->de_diroffset = to_diroffset & pmp->pm_crbomask;
+ ip->de_diroffset &= pmp->pm_crbomask;
}
reinsert(ip);
if (newparent)