aboutsummaryrefslogtreecommitdiff
path: root/sys/fs
diff options
context:
space:
mode:
authorDavid Greenman <dg@FreeBSD.org>1995-08-01 18:51:02 +0000
committerDavid Greenman <dg@FreeBSD.org>1995-08-01 18:51:02 +0000
commit4777741358be34ae3a042afe58616b974a07afce (patch)
tree7e1c28d400c2c70e77cbca3654c9d1ca5443bae3 /sys/fs
parent162efbb15c01960dd29a3b10bb8015cb126dd25d (diff)
downloadsrc-4777741358be34ae3a042afe58616b974a07afce.tar.gz
src-4777741358be34ae3a042afe58616b974a07afce.zip
Removed my special-case hack for VOP_LINK and fixed the problem with the
wrong vp's ops vector being used by changing the VOP_LINK's argument order. The special-case hack doesn't go far enough and breaks the generic bypass routine used in some non-leaf filesystems. Pointed out by Kirk McKusick.
Notes
Notes: svn path=/head/; revision=9842
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c4
-rw-r--r--sys/fs/unionfs/union_vnops.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 49de28cc5ea9..7abfb479eddf 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.17 1995/06/11 19:31:37 rgrimes Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.18 1995/06/28 07:06:48 davidg Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */
/*-
@@ -903,8 +903,8 @@ msdosfs_remove(ap)
int
msdosfs_link(ap)
struct vop_link_args /* {
- struct vnode *a_vp;
struct vnode *a_tdvp;
+ struct vnode *a_vp;
struct componentname *a_cnp;
} */ *ap;
{
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 0a1be17102af..315fc629e9e8 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.6 (Berkeley) 2/17/94
- * $Id: union_vnops.c,v 1.8 1994/11/04 14:41:46 davidg Exp $
+ * $Id: union_vnops.c,v 1.9 1995/06/28 07:06:46 davidg Exp $
*/
#include <sys/param.h>
@@ -898,8 +898,8 @@ union_remove(ap)
int
union_link(ap)
struct vop_link_args /* {
- struct vnode *a_vp;
struct vnode *a_tdvp;
+ struct vnode *a_vp;
struct componentname *a_cnp;
} */ *ap;
{
@@ -919,7 +919,7 @@ union_link(ap)
VREF(vp);
vrele(ap->a_tdvp);
- error = VOP_LINK(vp, dvp, ap->a_cnp);
+ error = VOP_LINK(dvp, vp, ap->a_cnp);
} else {
/*
* XXX: need to copy to upper layer