diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_export.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_extattr.c | 3 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 1f6b7a4..fd592943d 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -2460,7 +2460,7 @@ loop: if (!vget(vp, LK_INTERLOCK | LK_EXCLUSIVE | LK_RETRY | LK_NOOBJ, curproc)) { if (vp->v_object) { - vm_object_page_clean(vp->v_object, 0, 0, flags == MNT_WAIT ? OBJPC_SYNC : 0); + vm_object_page_clean(vp->v_object, 0, 0, flags == MNT_WAIT ? OBJPC_SYNC : OBJPC_NOSYNC); anyio = 1; } vput(vp); diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 4d5d394..a33a4de 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -1307,7 +1307,8 @@ symlink(p, uap) vput(nd.ni_vp); vput(nd.ni_dvp); ASSERT_VOP_UNLOCKED(nd.ni_dvp, "symlink"); - ASSERT_VOP_UNLOCKED(nd.ni_vp, "symlink"); + if (error == 0) + ASSERT_VOP_UNLOCKED(nd.ni_vp, "symlink"); out: zfree(namei_zone, path); return (error); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 1f6b7a4..fd592943d 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2460,7 +2460,7 @@ loop: if (!vget(vp, LK_INTERLOCK | LK_EXCLUSIVE | LK_RETRY | LK_NOOBJ, curproc)) { if (vp->v_object) { - vm_object_page_clean(vp->v_object, 0, 0, flags == MNT_WAIT ? OBJPC_SYNC : 0); + vm_object_page_clean(vp->v_object, 0, 0, flags == MNT_WAIT ? OBJPC_SYNC : OBJPC_NOSYNC); anyio = 1; } vput(vp); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 4d5d394..a33a4de 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1307,7 +1307,8 @@ symlink(p, uap) vput(nd.ni_vp); vput(nd.ni_dvp); ASSERT_VOP_UNLOCKED(nd.ni_dvp, "symlink"); - ASSERT_VOP_UNLOCKED(nd.ni_vp, "symlink"); + if (error == 0) + ASSERT_VOP_UNLOCKED(nd.ni_vp, "symlink"); out: zfree(namei_zone, path); return (error); |
