summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1994-11-29 23:39:15 +0000
committerache <ache@FreeBSD.org>1994-11-29 23:39:15 +0000
commitccc6ee52e9f1c40a26b1e4f1993365ab6d9eddc7 (patch)
tree09c734e12f19ec4c3af5ef226c89f252bf0572b8 /sys
parentb6942ab081d14c1083d801c2685112851b37c264 (diff)
downloadFreeBSD-src-ccc6ee52e9f1c40a26b1e4f1993365ab6d9eddc7.zip
FreeBSD-src-ccc6ee52e9f1c40a26b1e4f1993365ab6d9eddc7.tar.gz
Restore mv check, cause panic without it
Submitted by: Ade Barkah
Diffstat (limited to 'sys')
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c4
-rw-r--r--sys/msdosfs/msdosfs_vnops.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 73ee0a1..1203cae 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.7 1994/10/27 18:44:31 pst Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.8 1994/11/01 21:14:45 jkh Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */
/*-
@@ -972,14 +972,12 @@ msdosfs_rename(ap)
tdep = tvp ? VTODE(tvp) : NULL;
pmp = fddep->de_pmp;
-#ifdef __NetBSD__
/* Check for cross-device rename */
if ((ap->a_fvp->v_mount != ap->a_tdvp->v_mount) ||
(tvp && (ap->a_fvp->v_mount != tvp->v_mount))) {
error = EXDEV;
goto bad;
}
-#endif
/*
* Convert the filename in tcnp into a dos filename. We copy this
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 73ee0a1..1203cae 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.7 1994/10/27 18:44:31 pst Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.8 1994/11/01 21:14:45 jkh Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */
/*-
@@ -972,14 +972,12 @@ msdosfs_rename(ap)
tdep = tvp ? VTODE(tvp) : NULL;
pmp = fddep->de_pmp;
-#ifdef __NetBSD__
/* Check for cross-device rename */
if ((ap->a_fvp->v_mount != ap->a_tdvp->v_mount) ||
(tvp && (ap->a_fvp->v_mount != tvp->v_mount))) {
error = EXDEV;
goto bad;
}
-#endif
/*
* Convert the filename in tcnp into a dos filename. We copy this
OpenPOWER on IntegriCloud