Page MenuHomeFreeBSD

D57824.1794901080.diff
No OneTemporary

Authored By
Unknown
Size
941 B
Referenced Files
None
Subscribers
None

D57824.1794901080.diff

diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -1631,8 +1631,12 @@
dvp = ap->a_dvp;
vpp = ap->a_vpp;
vput(dvp);
- if (vpp != NULL && ap->a_unlock_vp && (vp = *vpp) != NULL)
- vput(vp);
+ if (vpp != NULL && ap->a_unlock_vp && (vp = *vpp) != NULL) {
+ if (dvp == vp)
+ vrele(vp);
+ else
+ vput(vp);
+ }
return (0);
}
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -2015,7 +2015,9 @@
mp = dvp->v_mount;
if (vp != NULL) {
- if (ap->a_unlock_vp) {
+ if (dvp == vp) {
+ vrele(vp);
+ } else if (ap->a_unlock_vp) {
vput(vp);
} else {
MPASS(vp->v_type != VNON);
@@ -2055,6 +2057,12 @@
} while (error == ERELOOKUP);
}
+ if (vp == dvp) {
+ if (ap->a_unlock_vp)
+ vput(dvp);
+ return (0);
+ }
+
vput(dvp);
if (vp == NULL || ap->a_unlock_vp)

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 17, 7:38 AM (6 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41784358
Default Alt Text
D57824.1794901080.diff (941 B)

Event Timeline