 @@ -1,14 +1,14 @@
-/*	$NetBSD: fss.c,v 1.81.4.1.4.1 2013/02/10 23:57:38 riz Exp $	*/
+/*	$NetBSD: fss.c,v 1.81.4.1.4.2 2013/02/11 20:39:04 riz Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * File system snapshot disk driver.
+ *
  * Block/character interface to the snapshot of a mounted file system.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.81.4.1.4.1 2013/02/10 23:57:38 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.81.4.1.4.2 2013/02/11 20:39:04 riz Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
 @@ -610,27 +610,27 @@ fss_copy_on_write(void *v, struct buf *b
 /*
  * Lookup and open needed files.
+ *
  * For file system internal snapshot initializes sc_mntname, sc_mount,
  * sc_bs_vp and sc_time.
+ *
  * Otherwise returns dev and size of the underlying block device.
  * Initializes sc_mntname, sc_mount, sc_bdev, sc_bs_vp and sc_mount
  */
 static int
 fss_create_files(struct fss_softc *sc, struct fss_set *fss,
     off_t *bsize, struct lwp *l)
+{
-	int error, bits, fsbsize;
+	int i, error, bits, fsbsize;
 	uint64_t numsec;
 	unsigned int secsize;
 	struct timespec ts;
 	/* nd -> nd2 to reduce mistakes while updating only some namei calls */
 	struct pathbuf *pb2;
 	struct nameidata nd2;
 	struct vnode *vp;
 	/*
 	 * Get the mounted file system.
 	 */
 	error = namei_simple_user(fss->fss_mount,
 @@ -681,45 +681,51 @@ fss_create_files(struct fss_softc *sc, s
 		error = vn_lock(vp, LK_EXCLUSIVE);
 		if (error != 0)
 			return error;
 		error = VFS_SNAPSHOT(sc->sc_mount, sc->sc_bs_vp, &ts);
 		TIMESPEC_TO_TIMEVAL(&sc->sc_time, &ts);
 		VOP_UNLOCK(sc->sc_bs_vp);
 		return error;
+	}
 	vrele(vp);
 	/*
-	 * Get the block device it is mounted on.
+	 * Get the block device it is mounted on and its size.
 	 */
-	error = namei_simple_kernel(sc->sc_mount->mnt_stat.f_mntfromname,
+	mutex_enter(&device_lock);
-				NSM_FOLLOW_NOEMULROOT, &vp);
+	for (i = 0; i < SPECHSZ; i++) {
-	if (error != 0)
+		for (vp = specfs_hash[i]; vp; vp = vp->v_specnext) {
-		return error;
+			if (vp->v_type == VBLK &&
 			    vp == vp->v_specnode->sn_dev->sd_bdevvp &&
-	if (vp->v_type != VBLK) {
+			    vp->v_specmountpoint == sc->sc_mount)
-		vrele(vp);
+				break;
+		}
 		if (vp != NULL)
 			break;
+	}
 	if (vp == NULL) {
 		mutex_exit(&device_lock);
 		return EINVAL;
+	}
 	mutex_enter(vp->v_interlock);
 	mutex_exit(&device_lock);
 	error = vget(vp, 0);
 	if (error)
 		return error;
 	sc->sc_bdev = vp->v_rdev;
 	/*
 	 * Get the block device size.
 	 */
 	error = getdisksize(vp, &numsec, &secsize);
 	vrele(vp);
 	if (error)
 		return error;
 	*bsize = (off_t)numsec*secsize;
 	/*
 	 * Get the backing store
 	 */
 	error = pathbuf_copyin(fss->fss_bstore, &pb2);
 	if (error) {