summaryrefslogtreecommitdiffstats
path: root/sys/fs/unionfs/union_subr.c
diff options
context:
space:
mode:
authorjeff <jeff@FreeBSD.org>2005-04-27 09:06:06 +0000
committerjeff <jeff@FreeBSD.org>2005-04-27 09:06:06 +0000
commitb6552bddeb676bedce3a313041701a955fa1fd6c (patch)
treebb1aa033be5e584fbc7c78415b922c81584309e0 /sys/fs/unionfs/union_subr.c
parentf869be5c723f74ca4c5c0d99a6ba4fcb9244126a (diff)
downloadFreeBSD-src-b6552bddeb676bedce3a313041701a955fa1fd6c.zip
FreeBSD-src-b6552bddeb676bedce3a313041701a955fa1fd6c.tar.gz
- Pass the ISOPEN flag down to our lower filesystems.
- Remove an erroneous VOP lock assert.
Diffstat (limited to 'sys/fs/unionfs/union_subr.c')
-rw-r--r--sys/fs/unionfs/union_subr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index fb014ba..6c63519 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -565,7 +565,6 @@ loop:
MALLOC((*vpp)->v_data, void *, sizeof(struct union_node),
M_TEMP, M_WAITOK);
- ASSERT_VOP_LOCKED(*vpp, "union_allocvp");
(*vpp)->v_vflag |= vflag;
if (uppervp)
(*vpp)->v_type = uppervp->v_type;
@@ -1065,7 +1064,7 @@ union_vn_create(vpp, un, td)
cn.cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
bcopy(un->un_path, cn.cn_pnbuf, cn.cn_namelen+1);
cn.cn_nameiop = CREATE;
- cn.cn_flags = (LOCKPARENT|LOCKLEAF|HASBUF|SAVENAME|ISLASTCN);
+ cn.cn_flags = ISOPEN|LOCKPARENT|LOCKLEAF|HASBUF|SAVENAME|ISLASTCN;
cn.cn_thread = td;
cn.cn_cred = td->td_ucred;
cn.cn_nameptr = cn.cn_pnbuf;
OpenPOWER on IntegriCloud