kernel - Fix duplicate da0 or da* and locked up boot

[dragonfly.git] / sys / kern / vfs_journal.c

diff --git a/sys/kern/vfs_journal.c b/sys/kern/vfs_journal.c
index c07773d..a8083d7 100644 (file)
--- a/sys/kern/vfs_journal.c
+++ b/sys/kern/vfs_journal.c
@@ -120,7 +120,7 @@ journal_create_threads(struct journal *jo)
        jo->flags &= ~(MC_JOURNAL_STOP_REQ | MC_JOURNAL_STOP_IMM);
        jo->flags |= MC_JOURNAL_WACTIVE;
        lwkt_create(journal_wthread, jo, NULL, &jo->wthread,
-                   TDF_STOPREQ, -1,
+                   TDF_NOSTART, -1,
                    "journal w:%.*s", JIDMAX, jo->id);
        lwkt_setpri(&jo->wthread, TDPRI_KERN_DAEMON);
        lwkt_schedule(&jo->wthread);
@@ -128,7 +128,7 @@ journal_create_threads(struct journal *jo)
        if (jo->flags & MC_JOURNAL_WANT_FULLDUPLEX) {
            jo->flags |= MC_JOURNAL_RACTIVE;
            lwkt_create(journal_rthread, jo, NULL, &jo->rthread,
-                       TDF_STOPREQ, -1,
+                       TDF_NOSTART, -1,
                        "journal r:%.*s", JIDMAX, jo->id);
            lwkt_setpri(&jo->rthread, TDPRI_KERN_DAEMON);
            lwkt_schedule(&jo->rthread);
@@ -1354,18 +1354,18 @@ jrecord_write_vnode_ref(struct jrecord *jrec, struct vnode *vp)
     struct nchandle nch;
 
     nch.mount = vp->v_mount;
-    spin_lock(&vp->v_spinlock);
+    spin_lock(&vp->v_spin);
     TAILQ_FOREACH(nch.ncp, &vp->v_namecache, nc_vnode) {
        if ((nch.ncp->nc_flag & (NCF_UNRESOLVED|NCF_DESTROYED)) == 0)
            break;
     }
     if (nch.ncp) {
        cache_hold(&nch);
-       spin_unlock(&vp->v_spinlock);
+       spin_unlock(&vp->v_spin);
        jrecord_write_path(jrec, JLEAF_PATH_REF, nch.ncp);
        cache_drop(&nch);
     } else {
-       spin_unlock(&vp->v_spinlock);
+       spin_unlock(&vp->v_spin);
     }
 }
 
@@ -1376,7 +1376,7 @@ jrecord_write_vnode_link(struct jrecord *jrec, struct vnode *vp,
     struct nchandle nch;
 
     nch.mount = vp->v_mount;
-    spin_lock(&vp->v_spinlock);
+    spin_lock(&vp->v_spin);
     TAILQ_FOREACH(nch.ncp, &vp->v_namecache, nc_vnode) {
        if (nch.ncp == notncp)
            continue;
@@ -1385,11 +1385,11 @@ jrecord_write_vnode_link(struct jrecord *jrec, struct vnode *vp,
     }
     if (nch.ncp) {
        cache_hold(&nch);
-       spin_unlock(&vp->v_spinlock);
+       spin_unlock(&vp->v_spin);
        jrecord_write_path(jrec, JLEAF_PATH_REF, nch.ncp);
        cache_drop(&nch);
     } else {
-       spin_unlock(&vp->v_spinlock);
+       spin_unlock(&vp->v_spin);
     }
 }