[src/netbsd-1-4]: src/sys/isofs/cd9660 pull up rev 1.40 from trunk (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/e9aebe835ace
branches:  netbsd-1-4
changeset: 469592:e9aebe835ace
user:      cgd <cgd%NetBSD.org@localhost>
date:      Mon Oct 18 05:05:04 1999 +0000

description:
pull up rev 1.40 from trunk (requested by wrstuden):
  In spec_close(), call the device's close routine with the vnode
  unlocked if the call might block. Force a non-blocking close if
  VXLOCK is set.  This eliminates a potential deadlock situation, and
  should eliminate the dirty buffers on reboot issue.

diffstat:

 sys/isofs/cd9660/cd9660_vfsops.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 9c48b0e98bb2 -r e9aebe835ace sys/isofs/cd9660/cd9660_vfsops.c
--- a/sys/isofs/cd9660/cd9660_vfsops.c  Mon Oct 18 05:05:00 1999 +0000
+++ b/sys/isofs/cd9660/cd9660_vfsops.c  Mon Oct 18 05:05:04 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660_vfsops.c,v 1.36 1999/02/26 23:44:45 wrstuden Exp $      */
+/*     $NetBSD: cd9660_vfsops.c,v 1.36.2.1 1999/10/18 05:05:04 cgd Exp $       */
 
 /*-
  * Copyright (c) 1994
@@ -452,8 +452,9 @@
 #endif
        
        isomp->im_devvp->v_specflags &= ~SI_MOUNTEDON;
+       vn_lock(isomp->im_devvp, LK_EXCLUSIVE | LK_RETRY);
        error = VOP_CLOSE(isomp->im_devvp, FREAD, NOCRED, p);
-       vrele(isomp->im_devvp);
+       vput(isomp->im_devvp);
        free((caddr_t)isomp, M_ISOFSMNT);
        mp->mnt_data = (qaddr_t)0;
        mp->mnt_flag &= ~MNT_LOCAL;