X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/ca43a5a8c6af11f3428c5caf6bc950f7085b177e..HEAD:/sys/kern/vfs_journal.c

diff --git a/sys/kern/vfs_journal.c b/sys/kern/vfs_journal.c
index c07773dfd0..1381af561f 100644
--- a/sys/kern/vfs_journal.c
+++ b/sys/kern/vfs_journal.c
@@ -30,8 +30,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $DragonFly: src/sys/kern/vfs_journal.c,v 1.33 2007/05/09 00:53:34 dillon Exp $
  */
 /*
  * The journaling protocol is intended to evolve into a two-way stream
@@ -89,7 +87,6 @@
 #include <vm/vnode_pager.h>
 
 #include <sys/file2.h>
-#include <sys/thread2.h>
 #include <sys/mplock2.h>
 #include <sys/spinlock2.h>
 
@@ -120,7 +117,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 +125,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);
@@ -1305,7 +1302,7 @@ jrecord_write_vattr(struct jrecord *jrec, struct vattr *vat)
     if (vat->va_flags != VNOVAL)
 	jrecord_leaf(jrec, JLEAF_FLAGS, &vat->va_flags, sizeof(vat->va_flags));
     if (vat->va_rmajor != VNOVAL) {
-	udev_t rdev = makeudev(vat->va_rmajor, vat->va_rminor);
+	dev_t rdev = makeudev(vat->va_rmajor, vat->va_rminor);
 	jrecord_leaf(jrec, JLEAF_UDEV, &rdev, sizeof(rdev));
 	jrecord_leaf(jrec, JLEAF_UMAJOR, &vat->va_rmajor, sizeof(vat->va_rmajor));
 	jrecord_leaf(jrec, JLEAF_UMINOR, &vat->va_rminor, sizeof(vat->va_rminor));
@@ -1354,18 +1351,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 +1373,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 +1382,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);
     }
 }