Page MenuHomeFreeBSD
Files F111649028

D23916.id74135.diff
No OneTemporary
Actions

D23916.id74135.diff
View Options

Index: sys/kern/vfs_cache.c
===================================================================
--- sys/kern/vfs_cache.c
+++ sys/kern/vfs_cache.c
@@ -3005,10 +3005,6 @@
cache_fpl_aborted(fpl);
return (false);
}
- if ((cnp->cn_flags & LOCKLEAF) == 0) {
- cache_fpl_aborted(fpl);
- return (false);
- }
if (cnp->cn_nameiop != LOOKUP) {
cache_fpl_aborted(fpl);
return (false);
@@ -3101,7 +3097,6 @@
tvp_seqc = fpl->tvp_seqc;
VNPASS(cache_fplookup_vnode_supported(dvp), dvp);
- MPASS((cnp->cn_flags & LOCKLEAF) != 0);
tvs = vget_prep_smr(tvp);
if (tvs == VGET_NONE) {
@@ -3116,13 +3111,19 @@
cache_fpl_smr_exit(fpl);
- error = vget_finish(tvp, cnp->cn_lkflags, tvs);
+ if ((cnp->cn_flags & LOCKLEAF) != 0)
+ error = vget_finish(tvp, cnp->cn_lkflags, tvs);
+ else
+ error = vget_finish_ref(tvp, tvs);
if (error != 0) {
return (cache_fpl_aborted(fpl));
}
if (!vn_seqc_consistent(tvp, tvp_seqc)) {
- vput(tvp);
+ if ((cnp->cn_flags & LOCKLEAF) != 0)
+ vput(tvp);
+ else
+ vrele(tvp);
return (cache_fpl_aborted(fpl));
}
Index: sys/kern/vfs_subr.c
===================================================================
--- sys/kern/vfs_subr.c
+++ sys/kern/vfs_subr.c
@@ -2955,7 +2955,7 @@
int
vget_finish(struct vnode *vp, int flags, enum vgetstate vs)
{
- int error, old;
+ int error;
if ((flags & LK_INTERLOCK) != 0)
ASSERT_VI_LOCKED(vp, __func__);
@@ -2972,6 +2972,17 @@
vp);
return (error);
}
+ return (vget_finish_ref(vp, vs));
+}
+
+int
+vget_finish_ref(struct vnode *vp, enum vgetstate vs)
+{
+ int old;
+
+ VNPASS(vs == VGET_HOLDCNT || vs == VGET_USECOUNT, vp);
+ VNPASS(vp->v_holdcnt > 0, vp);
+ VNPASS(vs == VGET_HOLDCNT || vp->v_usecount > 0, vp);
if (vs == VGET_USECOUNT)
return (0);
Index: sys/sys/vnode.h
===================================================================
--- sys/sys/vnode.h
+++ sys/sys/vnode.h
@@ -684,6 +684,7 @@
enum vgetstate vget_prep_smr(struct vnode *vp);
enum vgetstate vget_prep(struct vnode *vp);
int vget_finish(struct vnode *vp, int flags, enum vgetstate vs);
+int vget_finish_ref(struct vnode *vp, enum vgetstate vs);
void vget_abort(struct vnode *vp, enum vgetstate vs);
void vgone(struct vnode *vp);
void vhold(struct vnode *);

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 7, 12:18 PM (20 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17031889
Default Alt Text
D23916.id74135.diff (2 KB)

Event Timeline