Sun Jan 4 02:21:49 2009 UTC ()

fix rootdev format.


(christos)

diff -r1.335.2.5 -r1.335.2.6 src/sys/kern/vfs_subr.c

--- src/sys/kern/vfs_subr.c 2008/12/30 18:50:25	1.335.2.5
+++ src/sys/kern/vfs_subr.c 2009/01/04 02:21:49	1.335.2.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_subr.c,v 1.335.2.5 2008/12/30 18:50:25 christos Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.335.2.6 2009/01/04 02:21:49 christos Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -71,27 +71,27 @@
+ *
  * At nearly all points it is known that v_usecount could be zero, the
  * vnode interlock will be held.
+ *
  * To change v_usecount away from zero, the interlock must be held.  To
  * change from a non-zero value to zero, again the interlock must be
  * held.
+ *
  * Changing the usecount from a non-zero value to a non-zero value can
  * safely be done using atomic operations, without the interlock held.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.335.2.5 2008/12/30 18:50:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.335.2.6 2009/01/04 02:21:49 christos Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 @@ -2312,27 +2312,28 @@ vfs_shutdown(void)
 int
 vfs_mountroot(void)
+{
 	struct vfsops *v;
 	int error = ENODEV;
 	if (root_device == NULL)
 		panic("vfs_mountroot: root device unknown");
 	switch (device_class(root_device)) {
 	case DV_IFNET:
 		if (rootdev != NODEV)
 			panic("vfs_mountroot: rootdev set for DV_IFNET "
-			    "(0x%llx -> %llu,%llu)", rootdev,
+			    "(0x%llx -> %llu,%llu)",
 			    (unsigned long long)rootdev,
 			    (unsigned long long)major(rootdev),
 			    (unsigned long long)minor(rootdev));
 		break;
 	case DV_DISK:
 		if (rootdev == NODEV)
 			panic("vfs_mountroot: rootdev not set for DV_DISK");
 	        if (bdevvp(rootdev, &rootvp))
 	                panic("vfs_mountroot: can't get vnode for rootdev");
 		error = VOP_OPEN(rootvp, FREAD, FSCRED);
 		if (error) {
 			printf("vfs_mountroot: can't open root device\n");
 			return (error);
 @@ -2377,27 +2378,27 @@ vfs_mountroot(void)
 		mutex_enter(&vfs_list_lock);
 		v->vfs_refcount--;
 		if (!error) {
 			aprint_normal("root file system type: %s\n",
 			    v->vfs_name);
 			break;
+		}
+	}
 	mutex_exit(&vfs_list_lock);
 	if (v == NULL) {
 		printf("no file system for %s", device_xname(root_device));
 		if (device_class(root_device) == DV_DISK)
-			printf(" (dev 0x%llx)", rootdev);
+			printf(" (dev 0x%llx)", (unsigned long long)rootdev);
 		printf("\n");
 		error = EFTYPE;
+	}
 done:
 	if (error && device_class(root_device) == DV_DISK) {
 		VOP_CLOSE(rootvp, FREAD, FSCRED);
 		vrele(rootvp);
+	}
 	return (error);
+}
 /*