 @@ -1,14 +1,14 @@
-/* $NetBSD: nilfs_subr.c,v 1.6 2010/07/21 17:52:10 hannken Exp $ */
+/* $NetBSD: nilfs_subr.c,v 1.7 2010/08/11 11:43:13 pgoyette Exp $ */
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.6 2010/07/21 17:52:10 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.7 2010/08/11 11:43:13 pgoyette Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
 #include <sys/file.h>		/* define FWRITE ... */
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 @@ -831,27 +831,27 @@ nilfs_get_node_raw(struct nilfs_device *
 	/* crosslink */
 	node->vnode    = nvp;
 	node->ump      = ump;
 	node->nilfsdev = nilfsdev;
 	nvp->v_data    = node;
 	/* initiase nilfs node */
 	node->ino   = ino;
 	node->inode = *inode;
 	node->lockf = NULL;
 	/* needed? */
 	mutex_init(&node->node_mutex, MUTEX_DEFAULT, IPL_NONE);
-	cv_init(&node->node_lock, "nilfs_nlk");
+	cv_init(&node->node_lock, "nilfsnlk");
 	/* initialise genfs */
 	genfs_node_init(nvp, &nilfs_genfsops);
 	/* check if we're fetching the root */
 	if (ino == NILFS_ROOT_INO)
 		nvp->v_vflag |= VV_ROOT;
 	/* update vnode's file type XXX is there a function for this? */
 	nvp->v_type = VREG;
 	if (S_ISDIR(inode->i_mode))
 		nvp->v_type = VDIR;
 	if (S_ISLNK(inode->i_mode))

 @@ -1,14 +1,14 @@
-/* $NetBSD: nilfs_vfsops.c,v 1.3 2010/06/24 13:03:10 hannken Exp $ */
+/* $NetBSD: nilfs_vfsops.c,v 1.4 2010/08/11 11:43:13 pgoyette Exp $ */
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vfsops.c,v 1.3 2010/06/24 13:03:10 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vfsops.c,v 1.4 2010/08/11 11:43:13 pgoyette Exp $");
 #endif /* not lint */
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 @@ -622,27 +622,27 @@ nilfs_mount_device(struct vnode *devvp,
 		vrele(devvp);
 		return error;
+	}
 	/* opened ok, try mounting */
 	nilfsdev = malloc(sizeof(struct nilfs_device), M_NILFSMNT, M_WAITOK);
 	KASSERT(nilfsdev);
 	/* initialise */
 	memset(nilfsdev, 0, sizeof(struct nilfs_device));
 	nilfsdev->refcnt        = 1;
 	nilfsdev->devvp         = devvp;
 	nilfsdev->uncomitted_bl = 0;
-	cv_init(&nilfsdev->sync_cv, "nilfssync");
+	cv_init(&nilfsdev->sync_cv, "nilfsisyn");
 	STAILQ_INIT(&nilfsdev->mounts);
 	/* get our device's size */
 	error = VOP_IOCTL(devvp, DIOCGPART, &dpart, FREAD, NOCRED);
 	if (error) {
 		/* remove all our information */
 		nilfs_unmount_device(nilfsdev);
 		return EINVAL;
+	}
 	nilfsdev->devsize = dpart.part->p_size * dpart.disklab->d_secsize;
 	/* register nilfs_device in list */
 	SLIST_INSERT_HEAD(&nilfs_devices, nilfsdev, next_device);