summaryrefslogtreecommitdiff
path: root/sys/kern/vfs_extattr.c
diff options
context:
space:
mode:
authorJeff Roberson <jeff@FreeBSD.org>2002-09-25 02:13:38 +0000
committerJeff Roberson <jeff@FreeBSD.org>2002-09-25 02:13:38 +0000
commitd40a8125f5b5db52cfad0508eb06fefb7fb345fa (patch)
tree1276deec2dad8e342dd606a0e453b0e03a539f9a /sys/kern/vfs_extattr.c
parentd64370cb3003577072e1dd12539f1c8606facc47 (diff)
Notes
Diffstat (limited to 'sys/kern/vfs_extattr.c')
-rw-r--r--sys/kern/vfs_extattr.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 5ad587cb19e6..ad9ae633bd86 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -3075,7 +3075,11 @@ unionread:
return (error);
}
}
- mp_fixme("Accessing vflags w/o vn lock.");
+ /*
+ * XXX We could delay dropping the lock above but
+ * union_dircheckp complicates things.
+ */
+ vn_lock(vp, LK_EXCLUSIVE|LK_RETRY, td);
if ((vp->v_vflag & VV_ROOT) &&
(vp->v_mount->mnt_flag & MNT_UNION)) {
struct vnode *tvp = vp;
@@ -3083,9 +3087,10 @@ unionread:
VREF(vp);
fp->f_data = vp;
fp->f_offset = 0;
- vrele(tvp);
+ vput(tvp);
goto unionread;
}
+ VOP_UNLOCK(vp, 0, td);
}
error = copyout(&loff, SCARG(uap, basep), sizeof(long));
fdrop(fp, td);
@@ -3167,7 +3172,11 @@ unionread:
return (error);
}
}
- mp_fixme("Accessing vflag without vn lock.");
+ /*
+ * XXX We could delay dropping the lock above but
+ * union_dircheckp complicates things.
+ */
+ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
if ((vp->v_vflag & VV_ROOT) &&
(vp->v_mount->mnt_flag & MNT_UNION)) {
struct vnode *tvp = vp;
@@ -3175,9 +3184,10 @@ unionread:
VREF(vp);
fp->f_data = vp;
fp->f_offset = 0;
- vrele(tvp);
+ vput(tvp);
goto unionread;
}
+ VOP_UNLOCK(vp, 0, td);
}
if (SCARG(uap, basep) != NULL) {
error = copyout(&loff, SCARG(uap, basep), sizeof(long));