summaryrefslogtreecommitdiff
path: root/sys/msdosfs/msdosfs_vnops.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-10-04 03:06:05 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-10-04 03:06:05 +0000
commit64cb7b92e82bd77684999d74aa01e954884e6e79 (patch)
tree3ecdcc9ae938072bcfdaa7bc53ecbe2f4a0d5ed0 /sys/msdosfs/msdosfs_vnops.c
parent3caed03f1967bf8dce8538bde32da448348f47ba (diff)
sync
Diffstat (limited to 'sys/msdosfs/msdosfs_vnops.c')
-rw-r--r--sys/msdosfs/msdosfs_vnops.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 8a09cc6a58f..2f37fd4d299 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_vnops.c,v 1.5 1996/04/21 22:28:24 deraadt Exp $ */
+/* $OpenBSD: msdosfs_vnops.c,v 1.6 1996/10/04 03:05:32 deraadt Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.48 1996/03/20 00:45:43 thorpej Exp $ */
/*-
@@ -926,14 +926,6 @@ abortit:
return (error);
}
- /*
- * Convert the filename in tcnp into a dos filename. We copy this
- * into the denode and directory entry for the destination
- * file/directory.
- */
- if ((error = uniqdosname(VTODE(tdvp), tcnp, toname)) != 0)
- goto abortit;
-
/* */
if ((error = VOP_LOCK(fvp)) != 0)
goto abortit;
@@ -1034,6 +1026,14 @@ abortit:
}
/*
+ * Convert the filename in tcnp into a dos filename. We copy this
+ * into the denode and directory entry for the destination
+ * file/directory.
+ */
+ if ((error = uniqdosname(VTODE(tdvp), tcnp, toname)) != 0)
+ goto abortit;
+
+ /*
* Since from wasn't locked at various places above,
* have to do a relookup here.
*/