[src/netbsd-1-4]: src/sys/msdosfs Pull up revision 1.100 (requested by jdolec...

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

details:   https://anonhg.NetBSD.org/src/rev/c470f67cfa80
branches:  netbsd-1-4
changeset: 470806:c470f67cfa80
user:      he <he%NetBSD.org@localhost>
date:      Thu Jul 27 17:41:14 2000 +0000

description:
Pull up revision 1.100 (requested by jdolecek):
  Fix too many vrele()'s of fdvp in some error cases.
  Fixes PR#10312.

diffstat:

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

diffs (35 lines):

diff -r e3c7252430f4 -r c470f67cfa80 sys/msdosfs/msdosfs_vnops.c
--- a/sys/msdosfs/msdosfs_vnops.c       Thu Jul 27 17:36:40 2000 +0000
+++ b/sys/msdosfs/msdosfs_vnops.c       Thu Jul 27 17:41:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdosfs_vnops.c,v 1.79.2.7 2000/04/30 13:13:03 he Exp $        */
+/*     $NetBSD: msdosfs_vnops.c,v 1.79.2.8 2000/07/27 17:41:14 he Exp $        */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -927,6 +927,7 @@
        struct msdosfsmount *pmp;
        struct direntry *dotdotp;
        struct buf *bp;
+       int fdvp_dorele = 0;
 
        pmp = VFSTOMSDOSFS(fdvp->v_mount);
 
@@ -1095,6 +1096,7 @@
                vrele(tdvp);
                return 0;
        }
+       fdvp_dorele = 1;
        xp = VTODE(fvp);
        zp = VTODE(fdvp);
        from_diroffset = zp->de_fndoffset;
@@ -1203,7 +1205,8 @@
        vput(tdvp);
 out:
        ip->de_flag &= ~DE_RENAME;
-       vrele(fdvp);
+       if (fdvp_dorele)
+               vrele(fdvp);
        vrele(fvp);
        return (error);