[src/trunk]: src/sys/nfs Resolve delayed truncation from nfs_inactive() too.

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf78e700a035
branches:  trunk
changeset: 971677:cf78e700a035
user:      hannken <hannken%NetBSD.org@localhost>
date:      Fri May 01 08:43:00 2020 +0000

description:
Resolve delayed truncation from nfs_inactive() too.

Should prevent "locking against self" from nfs_unlock().

diffstat:

 sys/nfs/nfs_node.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 33ef8fce5a15 -r cf78e700a035 sys/nfs/nfs_node.c
--- a/sys/nfs/nfs_node.c        Fri May 01 08:32:50 2020 +0000
+++ b/sys/nfs/nfs_node.c        Fri May 01 08:43:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_node.c,v 1.125 2020/02/24 20:11:45 ad Exp $        */
+/*     $NetBSD: nfs_node.c,v 1.126 2020/05/01 08:43:00 hannken Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.125 2020/02/24 20:11:45 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.126 2020/05/01 08:43:00 hannken Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -186,6 +186,9 @@
        struct sillyrename *sp;
        struct vnode *vp = ap->a_vp;
 
+       /* If we have a delayed truncation, do it now. */
+       nfs_delayedtruncate(vp);
+
        np = VTONFS(vp);
        if (vp->v_type != VDIR) {
                sp = np->n_sillyrename;