 @@ -1,14 +1,14 @@
-/*	$NetBSD: puffs.c,v 1.92.4.4 2009/10/27 20:37:38 bouyer Exp $	*/
+/*	$NetBSD: puffs.c,v 1.92.4.5 2011/06/18 16:17:38 bouyer Exp $	*/
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Google Summer of Code program and the Ulla Tuominen Foundation.
  * The Google SoC project was mentored by Bill Studenmund.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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>
 #if !defined(lint)
-__RCSID("$NetBSD: puffs.c,v 1.92.4.4 2009/10/27 20:37:38 bouyer Exp $");
+__RCSID("$NetBSD: puffs.c,v 1.92.4.5 2011/06/18 16:17:38 bouyer Exp $");
 #endif /* !lint */
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <mntopts.h>
 #include <paths.h>
 #include <puffs.h>
 #include <stdio.h>
 @@ -89,26 +89,27 @@ fillvnopmask(struct puffs_ops *pops, uin
 	FILLOP(remove,   REMOVE);
 	FILLOP(link,     LINK);
 	FILLOP(rename,   RENAME);
 	FILLOP(mkdir,    MKDIR);
 	FILLOP(rmdir,    RMDIR);
 	FILLOP(symlink,  SYMLINK);
 	FILLOP(readdir,  READDIR);
 	FILLOP(readlink, READLINK);
 	FILLOP(reclaim,  RECLAIM);
 	FILLOP(inactive, INACTIVE);
 	FILLOP(print,    PRINT);
 	FILLOP(read,     READ);
 	FILLOP(write,    WRITE);
 	FILLOP(advlock,  ADVLOCK);
 	FILLOP(abortop,  ABORTOP);
+}
 #undef FILLOP
 /*
  * Go over all framev entries and write everything we can.  This is
  * mostly for the benefit of delivering "unmount" to the kernel.
  */
 static void
 finalpush(struct puffs_usermount *pu)
+{
 	struct puffs_fctrl_io *fio;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puffs_vnops.c,v 1.129.4.7 2010/01/16 17:52:13 bouyer Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.129.4.8 2011/06/18 16:17:38 bouyer Exp $	*/
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Google Summer of Code program and the Ulla Tuominen Foundation.
  * The Google SoC project was mentored by Bill Studenmund.
+ *
  * 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.
 @@ -20,35 +20,36 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.129.4.7 2010/01/16 17:52:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.129.4.8 2011/06/18 16:17:38 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/fstrans.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/lockf.h>
 #include <uvm/uvm.h>
 #include <fs/puffs/puffs_msgif.h>
 #include <fs/puffs/puffs_sys.h>
 #include <miscfs/fifofs/fifo.h>
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/specfs/specdev.h>
 int	puffs_vnop_lookup(void *);
 int	puffs_vnop_create(void *);
 int	puffs_vnop_access(void *);
 @@ -2114,44 +2115,45 @@ puffs_vnop_pathconf(void *v)
 int
 puffs_vnop_advlock(void *v)
+{
 	struct vop_advlock_args /* {
 		const struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		void *a_id;
 		int a_op;
 		struct flock *a_fl;
 		int a_flags;
 	} */ *ap = v;
 	PUFFS_MSG_VARS(vn, advlock);
 	struct vnode *vp = ap->a_vp;
 	struct puffs_node *pn = VPTOPP(vp);
 	struct puffs_mount *pmp = MPTOPUFFSMP(vp->v_mount);
 	int error;
 	if (!EXISTSOP(pmp, ADVLOCK))
 		return lf_advlock(ap, &pn->pn_lockf, vp->v_size);
 	PUFFS_MSG_ALLOC(vn, advlock);
-	error = copyin(ap->a_fl, &advlock_msg->pvnr_fl, sizeof(struct flock));
+	(void)memcpy(&advlock_msg->pvnr_fl, ap->a_fl,
-	if (error)
+		     sizeof(advlock_msg->pvnr_fl));
 		goto out;
 	advlock_msg->pvnr_id = ap->a_id;
 	advlock_msg->pvnr_op = ap->a_op;
 	advlock_msg->pvnr_flags = ap->a_flags;
 	puffs_msg_setinfo(park_advlock, PUFFSOP_VN,
 	    PUFFS_VN_ADVLOCK, VPTOPNC(vp));
 	PUFFS_MSG_ENQUEUEWAIT2(pmp, park_advlock, vp->v_data, NULL, error);
 	error = checkerr(pmp, error, __func__);
  out:
 	PUFFS_MSG_RELEASE(advlock);
 	return error;
+}
 int
 puffs_vnop_abortop(void *v)
+{
 	struct vop_abortop_args /* {
 		struct vnode *a_dvp;
 		struct componentname *a_cnp;
 	}; */ *ap = v;
 	PUFFS_MSG_VARS(vn, abortop);
 	struct vnode *dvp = ap->a_dvp;
 	struct puffs_mount *pmp = MPTOPUFFSMP(dvp->v_mount);