Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/fs/smbfs KASSERT() smp->sm_root is nonnull in unmount



details:   https://anonhg.NetBSD.org/src/rev/70d1985cdfb8
branches:  trunk
changeset: 543350:70d1985cdfb8
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Feb 23 21:27:33 2003 +0000

description:
KASSERT() smp->sm_root is nonnull in unmount
g/c unneeded variable in smbfs_root()

diffstat:

 sys/fs/smbfs/smbfs_vfsops.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r a626783a9346 -r 70d1985cdfb8 sys/fs/smbfs/smbfs_vfsops.c
--- a/sys/fs/smbfs/smbfs_vfsops.c       Sun Feb 23 21:26:26 2003 +0000
+++ b/sys/fs/smbfs/smbfs_vfsops.c       Sun Feb 23 21:27:33 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_vfsops.c,v 1.11 2003/02/23 19:30:13 jdolecek Exp $       */
+/*     $NetBSD: smbfs_vfsops.c,v 1.12 2003/02/23 21:27:33 jdolecek Exp $       */
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -222,6 +222,7 @@
 #ifdef QUOTA
 #endif
        /* Drop the extra reference to root vnode. */
+       KASSERT(smp->sm_root != NULL && SMBTOV(smp->sm_root) != NULL);
        vrele(SMBTOV(smp->sm_root));
 
        /* Flush all vnodes. */
@@ -254,7 +255,6 @@
 {
        struct smbmount *smp = VFSTOSMBFS(mp);
        struct vnode *vp;
-       struct smbnode *np;
        struct smbfattr fattr;
        struct proc *p = curproc;
        struct ucred *cred = p->p_ucred;
@@ -273,8 +273,7 @@
        if (error)
                return error;
        vp->v_flag |= VROOT;
-       np = VTOSMB(vp);
-       smp->sm_root = np;
+       smp->sm_root = VTOSMB(vp);
        *vpp = vp;
        return 0;
 }



Home | Main Index | Thread Index | Old Index