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

diff --git a/sys/kern/vfs_journal.c b/sys/kern/vfs_journal.c
index 99d3456799..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));