[src/trunk]: src/sys/nfs don't call nfs_delayedtruncate() from nfs_getpages().

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

details:   https://anonhg.NetBSD.org/src/rev/41457df8678a
branches:  trunk
changeset: 552056:41457df8678a
user:      yamt <yamt%NetBSD.org@localhost>
date:      Wed Sep 17 09:11:12 2003 +0000

description:
don't call nfs_delayedtruncate() from nfs_getpages().
it causes simplelock deadlock.

diffstat:

 sys/nfs/nfs_bio.c |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (33 lines):

diff -r db2d564e7442 -r 41457df8678a sys/nfs/nfs_bio.c
--- a/sys/nfs/nfs_bio.c Wed Sep 17 09:10:00 2003 +0000
+++ b/sys/nfs/nfs_bio.c Wed Sep 17 09:11:12 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_bio.c,v 1.108 2003/08/26 16:40:10 pk Exp $ */
+/*     $NetBSD: nfs_bio.c,v 1.109 2003/09/17 09:11:12 yamt Exp $       */
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.108 2003/08/26 16:40:10 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.109 2003/09/17 09:11:12 yamt Exp $");
 
 #include "opt_nfs.h"
 #include "opt_ddb.h"
@@ -1274,14 +1274,6 @@
        crhold(np->n_rcred);
 
        /*
-        * if we have delayed truncation and it's safe, do it now.
-        */
-       
-       if (ap->a_flags & PGO_SYNCIO) {
-               nfs_delayedtruncate(vp);
-       }
-
-       /*
         * call the genfs code to get the pages.  `pgs' may be NULL
         * when doing read-ahead.
         */