 @@ -1,14 +1,14 @@
-/*  $NetBSD: ops.c,v 1.50.2.7 2013/07/30 04:05:32 msaitoh Exp $ */
+/*  $NetBSD: ops.c,v 1.50.2.8 2014/11/03 19:18:09 msaitoh Exp $ */
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. 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.
+ *
 @@ -624,33 +624,43 @@ fuse_to_dirent(struct puffs_usermount *p
 			/*
 			 * (void *) for delint
 			 */
 			ndp = (char *)(void *)dents + written;
 			dents = (struct dirent *)(void *)ndp;
+		}
 		/*
 		 * Filesystem was mounted without -o use_ino
 		 * Perform a lookup to find it.
 		 */
 		if (fd->ino == PERFUSE_UNKNOWN_INO) {
 			struct puffs_node *pn;
 			struct perfuse_node_data *pnd = PERFUSE_NODE_DATA(opc);
-			if (node_lookup_common(pu, opc, NULL, fd->name,
+			/*
-					       NULL, &pn) != 0) {
+			 * Avoid breaking out of fs
-				DWARNX("node_lookup_common failed");
+			 * by lookup to .. on root
 			 */
 			if ((strcmp(fd->name, "..") == 0) &&
 			    (pnd->pnd_nodeid == FUSE_ROOT_ID)) {
 				fd->ino = FUSE_ROOT_ID;
 			} else {
-				fd->ino = pn->pn_va.va_fileid;
+				if (node_lookup_common(pu, opc, NULL, fd->name,
-				(void)perfuse_node_reclaim(pu, pn);
+						       NULL, &pn) != 0) {
 					DWARNX("node_lookup_common failed");
 				} else {
 					fd->ino = pn->pn_va.va_fileid;
 					(void)perfuse_node_reclaim(pu, pn);
+				}
+			}
+		}
 		dents->d_fileno = fd->ino;
 		dents->d_reclen = (unsigned short)reclen;
 		dents->d_namlen = fd->namelen;
 		dents->d_type = fd->type;
 		strlcpy(dents->d_name, fd->name, fd->namelen + 1);
 #ifdef PERFUSE_DEBUG
 		if (perfuse_diagflags & PDF_READDIR)
 			DPRINTF("%s: translated \"%s\" ino = %"PRIu64"\n",
 				__func__, dents->d_name, dents->d_fileno);
 @@ -1308,26 +1318,33 @@ perfuse_node_mknod(struct puffs_usermoun
 	error = node_mk_common(pu, opc, pni, pcn, pm);
 out:
 	node_rele(opc);
 	return error;
+}
 int
 perfuse_node_open(struct puffs_usermount *pu, puffs_cookie_t opc, int mode,
 	const struct puffs_cred *pcr)
+{
 	return perfuse_node_open2(pu, opc, mode, pcr, NULL);
+}
 int
 perfuse_node_open2(struct puffs_usermount *pu, puffs_cookie_t opc, int mode,
 	const struct puffs_cred *pcr, int *oflags)
+{
 	struct perfuse_state *ps;
 	struct perfuse_node_data *pnd;
 	perfuse_msg_t *pm;
 	mode_t fmode;
 	int op;
 	struct fuse_open_in *foi;
 	struct fuse_open_out *foo;
 	struct puffs_node *pn;
 	int error;
 	ps = puffs_getspecific(pu);
 	pn = (struct puffs_node *)opc;
 	pnd = PERFUSE_NODE_DATA(opc);
 @@ -1409,26 +1426,32 @@ perfuse_node_open(struct puffs_usermount
 	foi->unused = 0;
 	if ((error = xchg_msg(pu, opc, pm, sizeof(*foo), wait_reply)) != 0)
 		goto out;
 	foo = GET_OUTPAYLOAD(ps, pm, fuse_open_out);
 	/*
 	 * Save the file handle in node private data
 	 * so that we can reuse it later
 	 */
 	perfuse_new_fh(opc, foo->fh, mode);
 	/*
 	 * Set direct I/O if the filesystems forces it
 	 */
 	if ((foo->open_flags & FUSE_FOPEN_DIRECT_IO) && (oflags != NULL))
 		*oflags |= PUFFS_OPEN_IO_DIRECT;
 #ifdef PERFUSE_DEBUG
 	if (perfuse_diagflags & (PDF_FH|PDF_FILENAME))
 		DPRINTF("%s: opc = %p, file = \"%s\", "
 			"nodeid = 0x%"PRIx64", %s%sfh = 0x%"PRIx64"\n",
 			__func__, (void *)opc, perfuse_node_path(ps, opc),
 			pnd->pnd_nodeid, mode & FREAD ? "r" : "",
 			mode & FWRITE ? "w" : "", foo->fh);
 #endif
 	ps->ps_destroy_msg(pm);
 out:
 	pnd->pnd_flags &= ~PND_INOPEN;
 @@ -1524,27 +1547,27 @@ perfuse_node_getattr(struct puffs_usermo
 int
 perfuse_node_getattr_ttl(struct puffs_usermount *pu, puffs_cookie_t opc,
 	struct vattr *vap, const struct puffs_cred *pcr,
 	struct timespec *va_ttl)
+{
 	perfuse_msg_t *pm = NULL;
 	struct perfuse_state *ps;
 	struct perfuse_node_data *pnd = PERFUSE_NODE_DATA(opc);
 	struct fuse_getattr_in *fgi;
 	struct fuse_attr_out *fao;
 	int error = 0;
-	if (pnd->pnd_flags & PND_REMOVED)
+	if ((pnd->pnd_flags & PND_REMOVED) && !(pnd->pnd_flags & PND_OPEN))
 		return ENOENT;
 	node_ref(opc);
 	/*
 	 * Serialize size access, see comment in perfuse_node_setattr().
 	 */
 	while (pnd->pnd_flags & PND_INRESIZE)
 		requeue_request(pu, opc, PCQ_RESIZE);
 	pnd->pnd_flags |= PND_INRESIZE;
 	ps = puffs_getspecific(pu);
 @@ -1917,37 +1940,26 @@ perfuse_node_poll(struct puffs_usermount
 		goto out;
 	fpo = GET_OUTPAYLOAD(ps, pm, fuse_poll_out);
 	*events = fpo->revents;
 	ps->ps_destroy_msg(pm);
 	error = 0;
 out:
 	node_rele(opc);
 	return error;
+}
 /* ARGSUSED0 */
 int
 perfuse_node_mmap(struct puffs_usermount *pu, puffs_cookie_t opc, int flags,
 	const struct puffs_cred *pcr)
 	/*
 	 * Not implemented anymore in libfuse
 	 */
 	return ENOSYS;
 /* ARGSUSED2 */
 int
 perfuse_node_fsync(struct puffs_usermount *pu, puffs_cookie_t opc,
 	const struct puffs_cred *pcr, int flags, off_t offlo, off_t offhi)
+{
 	int op;
 	perfuse_msg_t *pm;
 	struct perfuse_state *ps;
 	struct perfuse_node_data *pnd;
 	struct fuse_fsync_in *ffi;
 	uint64_t fh;
 	int error = 0;
 @@ -2042,34 +2054,26 @@ perfuse_node_fsync(struct puffs_usermoun
 	error = 0;
 out:
 	/*
 	 * ENOSYS is not returned to kernel,
 	 */
 	if (error == ENOSYS)
 		error = 0;
 	node_rele(opc);
 	return error;
+}
 /* ARGSUSED0 */
 int
 perfuse_node_seek(struct puffs_usermount *pu, puffs_cookie_t opc,
 	off_t oldoff, off_t newoff, const struct puffs_cred *pcr)
 	return 0;
 int
 perfuse_node_remove(struct puffs_usermount *pu, puffs_cookie_t opc,
 	puffs_cookie_t targ, const struct puffs_cn *pcn)
+{
 	struct perfuse_state *ps;
 	struct perfuse_node_data *pnd;
 	perfuse_msg_t *pm;
 	char *path;
 	const char *name;
 	size_t len;
 	int error;
 	pnd = PERFUSE_NODE_DATA(opc);
 @@ -3001,31 +3005,26 @@ perfuse_node_read(struct puffs_usermount
 	int error;
 	ps = puffs_getspecific(pu);
 	pnd = PERFUSE_NODE_DATA(opc);
 	vap = puffs_pn_getvap((struct puffs_node *)opc);
 	/*
 	 * NetBSD turns that into a getdents(2) output
 	 * We just do a EISDIR as this feature is of little use.
 	 */
 	if (vap->va_type == VDIR)
 		return EISDIR;
 	if ((u_quad_t)offset + *resid > vap->va_size)
 		DWARNX("%s %p read %lld@%zu beyond EOF %" PRIu64 "\n",
 		       __func__, (void *)opc, (long long)offset,
 		       *resid, vap->va_size);
 	do {
 		size_t max_read;
 		max_read = ps->ps_max_readahead - sizeof(*foh);
 		/*
 		 * flags may be set to FUSE_READ_LOCKOWNER
 		 * if lock_owner is provided.
 		 */
 		pm = ps->ps_new_msg(pu, opc, FUSE_READ, sizeof(*fri), pcr);
 		fri = GET_INPAYLOAD(ps, pm, fuse_read_in);
 		fri->fh = perfuse_get_fh(opc, FREAD);
 		fri->offset = offset;
 		fri->size = (uint32_t)MIN(*resid, max_read);
 @@ -3120,28 +3119,26 @@ perfuse_node_write2(struct puffs_usermou
 	 */
 	if ((u_quad_t)offset + *resid > vap->va_size) {
 		while (pnd->pnd_flags & PND_INRESIZE)
 			requeue_request(pu, opc, PCQ_RESIZE);
 		pnd->pnd_flags |= PND_INRESIZE;
 		inresize = 1;
+	}
 	/*
 	 * append flag: re-read the file size so that
 	 * we get the latest value.
 	 */
 	if (ioflag & PUFFS_IO_APPEND) {
 		DWARNX("%s: PUFFS_IO_APPEND set, untested code", __func__);
 		if ((error = perfuse_node_getattr(pu, opc, vap, pcr)) != 0)
 			goto out;
 		offset = vap->va_size;
+	}
 #ifdef PERFUSE_DEBUG
 	if (perfuse_diagflags & PDF_RESIZE)
 		DPRINTF(">> %s %p %" PRIu64 "\n", __func__,
 			(void *)opc, vap->va_size);
 #endif
 	do {
 @@ -3293,26 +3290,30 @@ perfuse_node_getextattr(struct puffs_use
 	size_t *resid, const struct puffs_cred *pcr)
+{
 	struct perfuse_state *ps;
 	char fuse_attrname[LINUX_XATTR_NAME_MAX + 1];
 	perfuse_msg_t *pm;
 	struct fuse_getxattr_in *fgi;
 	struct fuse_getxattr_out *fgo;
 	struct fuse_out_header *foh;
 	size_t attrnamelen;
 	size_t len;
 	char *np;
 	int error;
 	/* system namespace attrs are not accessible to non root users */
 	if (attrns == EXTATTR_NAMESPACE_SYSTEM && !puffs_cred_isjuggernaut(pcr))
 		return EPERM;
 	node_ref(opc);
 	ps = puffs_getspecific(pu);
 	attrname = perfuse_native_ns(attrns, attrname, fuse_attrname);
 	attrnamelen = strlen(attrname) + 1;
 	len = sizeof(*fgi) + attrnamelen;
 	pm = ps->ps_new_msg(pu, opc, FUSE_GETXATTR, len, pcr);
 	fgi = GET_INPAYLOAD(ps, pm, fuse_getxattr_in);
 	fgi->size = (unsigned int)((resid != NULL) ? *resid : 0);
 	np = (char *)(void *)(fgi + 1);
 	(void)strlcpy(np, attrname, attrnamelen);
 	if ((error = xchg_msg(pu, opc, pm, UNSPEC_REPLY_LEN, wait_reply)) != 0)
 @@ -3329,55 +3330,68 @@ perfuse_node_getextattr(struct puffs_use
 			*attrsize = fgo->size;
 		ps->ps_destroy_msg(pm);
 		error = 0;
 		goto out;
+	}
 	/*
 	 * And with a non null requested size, we get the list just
 	 * after the header
 	 */
 	foh = GET_OUTHDR(ps, pm);
 	np = (char *)(void *)(foh + 1);
 	len = foh->len - sizeof(*foh);
 	if (attrsize != NULL)
 		*attrsize = len;
 	if (resid != NULL) {
-		len = MAX(foh->len - sizeof(*foh), *resid);
+		if (*resid < len) {
 			error = ERANGE;
 			ps->ps_destroy_msg(pm);
 			goto out;
+		}
 		(void)memcpy(attr, np, len);
 		*resid -= len;
+	}
 	ps->ps_destroy_msg(pm);
 	error = 0;
 out:
 	node_rele(opc);
 	return error;
+}
 int
 perfuse_node_setextattr(struct puffs_usermount *pu, puffs_cookie_t opc,
 	int attrns, const char *attrname, uint8_t *attr, size_t *resid,
 	const struct puffs_cred *pcr)
+{
 	struct perfuse_state *ps;
 	char fuse_attrname[LINUX_XATTR_NAME_MAX + 1];
 	perfuse_msg_t *pm;
 	struct fuse_setxattr_in *fsi;
 	size_t attrnamelen;
 	size_t len;
 	char *np;
 	int error;
 	/* system namespace attrs are not accessible to non root users */
 	if (attrns == EXTATTR_NAMESPACE_SYSTEM && !puffs_cred_isjuggernaut(pcr))
 		return EPERM;
 	node_ref(opc);
 	ps = puffs_getspecific(pu);
 	attrname = perfuse_native_ns(attrns, attrname, fuse_attrname);
 	attrnamelen = strlen(attrname) + 1;
 	len = sizeof(*fsi) + attrnamelen + *resid;
 	pm = ps->ps_new_msg(pu, opc, FUSE_SETXATTR, len, pcr);
 	fsi = GET_INPAYLOAD(ps, pm, fuse_setxattr_in);
 	fsi->size = (unsigned int)*resid;
 	fsi->flags = 0;
 	np = (char *)(void *)(fsi + 1);
 	(void)strlcpy(np, attrname, attrnamelen);
 	np += attrnamelen;
 @@ -3398,29 +3412,33 @@ out:
 /* ARGSUSED2 */
 int
 perfuse_node_listextattr(struct puffs_usermount *pu, puffs_cookie_t opc,
 	int attrns, size_t *attrsize, uint8_t *attrs, size_t *resid, int flag,
 	const struct puffs_cred *pcr)
+{
 	struct perfuse_state *ps;
 	perfuse_msg_t *pm;
 	struct fuse_getxattr_in *fgi;
 	struct fuse_getxattr_out *fgo;
 	struct fuse_out_header *foh;
 	char *np;
-	size_t len, puffs_len;
+	size_t len, puffs_len, i, attrlen, outlen;
 	int error;
 	/* system namespace attrs are not accessible to non root users */
 	if (attrns == EXTATTR_NAMESPACE_SYSTEM && !puffs_cred_isjuggernaut(pcr))
 		return EPERM;
 	node_ref(opc);
 	ps = puffs_getspecific(pu);
 	len = sizeof(*fgi);
 	pm = ps->ps_new_msg(pu, opc, FUSE_LISTXATTR, len, pcr);
 	fgi = GET_INPAYLOAD(ps, pm, fuse_getxattr_in);
 	if (resid != NULL)
 		fgi->size = (unsigned int)*resid;
 	else
 		fgi->size = 0;
 	if ((error = xchg_msg(pu, opc, pm, UNSPEC_REPLY_LEN, wait_reply)) != 0)
 @@ -3440,68 +3458,88 @@ perfuse_node_listextattr(struct puffs_us
 		error = 0;
 		goto out;
+	}
 	/*
 	 * And with a non null requested size, we get the list just
 	 * after the header
 	 */
 	foh = GET_OUTHDR(ps, pm);
 	np = (char *)(void *)(foh + 1);
 	puffs_len = foh->len - sizeof(*foh);
-	if (attrs != NULL) {
+	if (attrsize != NULL)
-#ifdef PUFFS_EXTATTR_LIST_LENPREFIX
+		*attrsize = puffs_len;
 		/*
 		 * Convert the FUSE reply to length prefixed strings
 		 * if this is what the kernel wants.
 		 */
 		if (flag & PUFFS_EXTATTR_LIST_LENPREFIX) {
 			size_t i, attrlen;
-			for (i = 0; i < puffs_len; i += attrlen + 1) {
+	if (attrs != NULL) {
-				attrlen = strlen(np + i);
+		if (*resid < puffs_len) {
-				(void)memmove(np + i + 1, np + i, attrlen);
+			error = ERANGE;
-				*(np + i) = (uint8_t)attrlen;
+			ps->ps_destroy_msg(pm);
 			goto out;
+		}
 		outlen = 0;
 		for (i = 0; i < puffs_len; i += attrlen + 1) {
 			attrlen = strlen(np + i);
 			/*
 			 * Filter attributes per namespace
 			 */
 			if (!perfuse_ns_match(attrns, np + i))
 				continue;
 #ifdef PUFFS_EXTATTR_LIST_LENPREFIX
 			/*
 			 * Convert the FUSE reply to length prefixed strings
 			 * if this is what the kernel wants.
 			 */
 			if (flag & PUFFS_EXTATTR_LIST_LENPREFIX) {
 				(void)memcpy(attrs + outlen + 1,
 					     np + i, attrlen);
 				*(attrs + outlen) = (uint8_t)attrlen;
 			} else
 #endif /* PUFFS_EXTATTR_LIST_LENPREFIX */
-		(void)memcpy(attrs, np, puffs_len);
+			(void)memcpy(attrs + outlen, np + i, attrlen + 1);
-		*resid -= puffs_len;
+			outlen += attrlen + 1;
+		}
-	if (attrsize != NULL)
+		*resid -= outlen;
 		*attrsize = puffs_len;
 	ps->ps_destroy_msg(pm);
 	error = 0;
 out:
 	node_rele(opc);
 	return error;
+}
 int
 perfuse_node_deleteextattr(struct puffs_usermount *pu, puffs_cookie_t opc,
 	int attrns, const char *attrname, const struct puffs_cred *pcr)
+{
 	struct perfuse_state *ps;
 	char fuse_attrname[LINUX_XATTR_NAME_MAX + 1];
 	perfuse_msg_t *pm;
 	size_t attrnamelen;
 	char *np;
 	int error;
 	/* system namespace attrs are not accessible to non root users */
 	if (attrns == EXTATTR_NAMESPACE_SYSTEM && !puffs_cred_isjuggernaut(pcr))
 		return EPERM;
 	node_ref(opc);
 	ps = puffs_getspecific(pu);
 	attrname = perfuse_native_ns(attrns, attrname, fuse_attrname);
 	attrnamelen = strlen(attrname) + 1;
 	pm = ps->ps_new_msg(pu, opc, FUSE_REMOVEXATTR, attrnamelen, pcr);
 	np = _GET_INPAYLOAD(ps, pm, char *);
 	(void)strlcpy(np, attrname, attrnamelen);
 	error = xchg_msg(pu, opc, pm, NO_PAYLOAD_REPLY_LEN, wait_reply);
 	ps->ps_destroy_msg(pm);

 @@ -1,14 +1,14 @@
-/*  $NetBSD: perfuse.c,v 1.25.2.3 2012/09/13 22:31:03 riz Exp $ */
+/*  $NetBSD: perfuse.c,v 1.25.2.4 2014/11/03 19:18:09 msaitoh Exp $ */
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. 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.
+ *
 @@ -461,31 +461,27 @@ perfuse_init(struct perfuse_callbacks *p
 	PUFFSOP_INIT(pops);
 	PUFFSOP_SET(pops, perfuse, fs, unmount);
 	PUFFSOP_SET(pops, perfuse, fs, statvfs);
 	PUFFSOP_SET(pops, perfuse, fs, sync);
 	PUFFSOP_SET(pops, perfuse, node, lookup);
 	PUFFSOP_SET(pops, perfuse, node, create);
 	PUFFSOP_SET(pops, perfuse, node, mknod);
 	PUFFSOP_SET(pops, perfuse, node, open);
 	PUFFSOP_SET(pops, perfuse, node, close);
 	PUFFSOP_SET(pops, perfuse, node, access);
 	PUFFSOP_SET(pops, perfuse, node, getattr);
 	PUFFSOP_SET(pops, perfuse, node, setattr);
 	PUFFSOP_SET(pops, perfuse, node, poll);
 #if 0
 	PUFFSOP_SET(pops, perfuse, node, mmap);
 #endif
 	PUFFSOP_SET(pops, perfuse, node, fsync);
 	PUFFSOP_SET(pops, perfuse, node, seek);
 	PUFFSOP_SET(pops, perfuse, node, remove);
 	PUFFSOP_SET(pops, perfuse, node, link);
 	PUFFSOP_SET(pops, perfuse, node, rename);
 	PUFFSOP_SET(pops, perfuse, node, mkdir);
 	PUFFSOP_SET(pops, perfuse, node, rmdir);
 	PUFFSOP_SET(pops, perfuse, node, symlink);
 	PUFFSOP_SET(pops, perfuse, node, readdir);
 	PUFFSOP_SET(pops, perfuse, node, readlink);
 	PUFFSOP_SET(pops, perfuse, node, reclaim);
 	PUFFSOP_SET(pops, perfuse, node, inactive);
 	PUFFSOP_SET(pops, perfuse, node, print);
 	PUFFSOP_SET(pops, perfuse, node, advlock);
 	PUFFSOP_SET(pops, perfuse, node, read);
 @@ -493,26 +489,29 @@ perfuse_init(struct perfuse_callbacks *p
 #ifdef PUFFS_EXTNAMELEN
 	PUFFSOP_SET(pops, perfuse, node, getextattr);
 	PUFFSOP_SET(pops, perfuse, node, setextattr);
 	PUFFSOP_SET(pops, perfuse, node, listextattr);
 	PUFFSOP_SET(pops, perfuse, node, deleteextattr);
 #endif /* PUFFS_EXTNAMELEN */
 #ifdef PUFFS_KFLAG_CACHE_FS_TTL
 	PUFFSOP_SET(pops, perfuse, node, getattr_ttl);
 	PUFFSOP_SET(pops, perfuse, node, setattr_ttl);
 #endif /* PUFFS_KFLAG_CACHE_FS_TTL */
 #ifdef PUFFS_SETATTR_FAF
 	PUFFSOP_SET(pops, perfuse, node, write2);
 #endif /* PUFFS_SETATTR_FAF */
 #ifdef PUFFS_OPEN_IO_DIRECT
 	PUFFSOP_SET(pops, perfuse, node, open2);
 #endif /* PUFFS_OPEN_IO_DIRECT */
 	/*
 	 * PUFFS_KFLAG_NOCACHE_NAME is required so that we can see changes
 	 * done by other machines in networked filesystems. In later
 	 * NetBSD releases we use the alternative PUFFS_KFLAG_CACHE_FS_TTL,
 	 * which implement name cache with a filesystem-provided TTL.
 	 */
 #ifdef PUFFS_KFLAG_CACHE_FS_TTL
 	puffs_flags = PUFFS_KFLAG_CACHE_FS_TTL;
 #else
 	puffs_flags = PUFFS_KFLAG_NOCACHE_NAME;
 #endif

 @@ -1,14 +1,14 @@
-/*  $NetBSD: perfuse_priv.h,v 1.25.2.4 2012/08/12 13:13:20 martin Exp $ */
+/*  $NetBSD: perfuse_priv.h,v 1.25.2.5 2014/11/03 19:18:09 msaitoh Exp $ */
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. 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.
+ *
 @@ -176,26 +176,27 @@ struct perfuse_node_data {
 #define _GET_OUTPAYLOAD(ps, pm, type) (type)ps->ps_get_outpayload(pm)
 __BEGIN_DECLS
 struct puffs_node *perfuse_new_pn(struct puffs_usermount *, const char *,
     struct puffs_node *);
 void perfuse_destroy_pn(struct puffs_usermount *, struct puffs_node *);
 void perfuse_new_fh(puffs_cookie_t, uint64_t, int);
 void perfuse_destroy_fh(puffs_cookie_t, uint64_t);
 uint64_t perfuse_get_fh(puffs_cookie_t, int);
 uint64_t perfuse_next_unique(struct puffs_usermount *);
 char *perfuse_node_path(struct perfuse_state *, puffs_cookie_t);
 int perfuse_node_close_common(struct puffs_usermount *, puffs_cookie_t, int);
 int perfuse_ns_match(const int, const char *);
 const char *perfuse_native_ns(const int, const char *, char *);
 char *perfuse_fs_mount(int, ssize_t);
 /*
  * ops.c - filesystem operations
  */
 int perfuse_fs_unmount(struct puffs_usermount *, int);
 int perfuse_fs_statvfs(struct puffs_usermount *, struct statvfs *);
 int perfuse_fs_sync(struct puffs_usermount *, int,
     const struct puffs_cred *);
 int perfuse_fs_fhtonode(struct puffs_usermount *, void *, size_t,
 @@ -212,32 +213,28 @@ int perfuse_node_mknod(struct puffs_user
     puffs_cookie_t, struct puffs_newinfo *, const struct puffs_cn *,
     const struct vattr *);
 int perfuse_node_open(struct puffs_usermount *,
     puffs_cookie_t, int, const struct puffs_cred *);
 int perfuse_node_close(struct puffs_usermount *,
     puffs_cookie_t, int, const struct puffs_cred *);
 int perfuse_node_access(struct puffs_usermount *,
     puffs_cookie_t, int, const struct puffs_cred *);
 int perfuse_node_getattr(struct puffs_usermount *,
     puffs_cookie_t, struct vattr *, const struct puffs_cred *);
 int perfuse_node_setattr(struct puffs_usermount *,
     puffs_cookie_t, const struct vattr *, const struct puffs_cred *);
 int perfuse_node_poll(struct puffs_usermount *, puffs_cookie_t, int *);
 int perfuse_node_mmap(struct puffs_usermount *,
     puffs_cookie_t, vm_prot_t, const struct puffs_cred *);
 int perfuse_node_fsync(struct puffs_usermount *,
     puffs_cookie_t, const struct puffs_cred *, int, off_t, off_t);
 int perfuse_node_seek(struct puffs_usermount *,
     puffs_cookie_t, off_t, off_t, const struct puffs_cred *);
 int perfuse_node_remove(struct puffs_usermount *,
     puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *);
 int perfuse_node_link(struct puffs_usermount *,
     puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *);
 int perfuse_node_rename(struct puffs_usermount *,
     puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *,
     puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *);
 int perfuse_node_mkdir(struct puffs_usermount *,
     puffs_cookie_t, struct puffs_newinfo *, const struct puffs_cn *,
     const struct vattr *);
 int perfuse_node_rmdir(struct puffs_usermount *,
     puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *);
 int perfuse_node_symlink(struct puffs_usermount *,
 @@ -251,26 +248,28 @@ int perfuse_node_readlink(struct puffs_u
 int perfuse_node_reclaim(struct puffs_usermount *, puffs_cookie_t);
 int perfuse_node_inactive(struct puffs_usermount *, puffs_cookie_t);
 int perfuse_node_print(struct puffs_usermount *, puffs_cookie_t);
 int perfuse_node_pathconf(struct puffs_usermount *,
     puffs_cookie_t, int, int *);
 int perfuse_node_advlock(struct puffs_usermount *,
     puffs_cookie_t, void *, int, struct flock *, int);
 int perfuse_node_read(struct puffs_usermount *, puffs_cookie_t,
     uint8_t *, off_t, size_t *, const struct puffs_cred *, int);
 int perfuse_node_write(struct puffs_usermount *, puffs_cookie_t,
     uint8_t *, off_t, size_t *, const struct puffs_cred *, int);
 int perfuse_node_write2(struct puffs_usermount *, puffs_cookie_t,
     uint8_t *, off_t, size_t *, const struct puffs_cred *, int, int);
 int perfuse_node_open2(struct puffs_usermount *,
     puffs_cookie_t, int, const struct puffs_cred *, int *);
 void perfuse_cache_write(struct puffs_usermount *,
     puffs_cookie_t, size_t, struct puffs_cacherun *);
 int perfuse_node_getextattr(struct puffs_usermount *, puffs_cookie_t,
     int, const char *, size_t *, uint8_t *, size_t *,
     const struct puffs_cred *);
 int perfuse_node_setextattr(struct puffs_usermount *, puffs_cookie_t,
     int, const char *, uint8_t *, size_t *, const struct puffs_cred *);
 int perfuse_node_listextattr(struct puffs_usermount *, puffs_cookie_t,
     int, size_t *, uint8_t *, size_t *, int, const struct puffs_cred *);
 int perfuse_node_deleteextattr(struct puffs_usermount *, puffs_cookie_t,
     int, const char *, const struct puffs_cred *);
 int perfuse_node_getattr_ttl(struct puffs_usermount *,
     puffs_cookie_t, struct vattr *, const struct puffs_cred *,

 @@ -1,14 +1,14 @@
-/*  $NetBSD: subr.c,v 1.15.2.3 2012/08/12 13:13:20 martin Exp $ */
+/*  $NetBSD: subr.c,v 1.15.2.4 2014/11/03 19:18:09 msaitoh Exp $ */
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. 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.
+ *
 @@ -205,26 +205,40 @@ char *
 perfuse_node_path(struct perfuse_state *ps, puffs_cookie_t opc)
+{
 	static char buf[MAXPATHLEN + 1];
 #if 0
 	if (node_path(ps, opc, buf, sizeof(buf)) == 0)
 		sprintf(buf, "/");
 #endif
 	sprintf(buf, "%s", PERFUSE_NODE_DATA(opc)->pnd_name);
 	return buf;
+}
 int
 perfuse_ns_match(const int attrnamespace, const char *attrname)
+{
 	const char *system_ns[] = { "system.", "trusted.", "security", NULL };
 	int i;
         for (i = 0; system_ns[i]; i++) {
                 if (strncmp(attrname, system_ns[i], strlen(system_ns[i])) == 0)
 			return (attrnamespace == EXTATTR_NAMESPACE_SYSTEM);
+        }
 	return (attrnamespace == EXTATTR_NAMESPACE_USER);
+}
 const char *
 perfuse_native_ns(const int attrnamespace, const char *attrname,
 	char *fuse_attrname)
+{
 	const struct perfuse_ns_map *pnm;
 	const struct perfuse_ns_map perfuse_ns_map[] = {
 		PERFUSE_NS_MAP("trusted", EXTATTR_NAMESPACE_SYSTEM),
 		PERFUSE_NS_MAP("security", EXTATTR_NAMESPACE_SYSTEM),
 		PERFUSE_NS_MAP("system", EXTATTR_NAMESPACE_SYSTEM),
 		PERFUSE_NS_MAP("user", EXTATTR_NAMESPACE_USER),
 		{ NULL, 0, EXTATTR_NAMESPACE_USER },
 	};

 @@ -1,14 +1,14 @@
-/*	$NetBSD: creds.c,v 1.15 2009/11/20 14:23:54 pooka Exp $	*/
+/*	$NetBSD: creds.c,v 1.15.8.1 2014/11/03 19:18:09 msaitoh Exp $	*/
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the Ulla Tuominen Foundation.
+ *
  * 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
 @@ -19,27 +19,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: creds.c,v 1.15 2009/11/20 14:23:54 pooka Exp $");
+__RCSID("$NetBSD: creds.c,v 1.15.8.1 2014/11/03 19:18:09 msaitoh Exp $");
 #endif /* !lint */
 /*
  * Interface for dealing with credits.
  */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <puffs.h>
 #include <stdbool.h>
 #include <string.h>
 @@ -240,20 +240,21 @@ puffs_access_chmod(uid_t owner, gid_t gr
 			return EFTYPE;
 		if (!puffs_cred_hasgroup(pcr, group) && (mode & S_ISGID))
 			return EPERM;
+	}
 	return 0;
+}
 int
 puffs_access_times(uid_t uid, gid_t gid, mode_t mode, int va_utimes_null,
 	const struct puffs_cred *pcr)
+{
-	if (!puffs_cred_isuid(pcr, uid) && !puffs_cred_isjuggernaut(pcr)
+	if (puffs_cred_isuid(pcr, uid) || puffs_cred_isjuggernaut(pcr))
-	    && (va_utimes_null == 0
+		return 0;
 	      || puffs_access(VNON, mode, uid, gid, PUFFS_VWRITE, pcr) != 0))
 	if (va_utimes_null == 0)
 		return EPERM;
-	return 0;
+	return puffs_access(VNON, mode, uid, gid, PUFFS_VWRITE, pcr);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dispatcher.c,v 1.38.2.4 2012/09/13 20:20:15 riz Exp $	*/
+/*	$NetBSD: dispatcher.c,v 1.38.2.5 2014/11/03 19:18:09 msaitoh Exp $	*/
 /*
  * Copyright (c) 2006, 2007, 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Ulla Tuominen Foundation, the Finnish Cultural Foundation and
  * Research Foundation of Helsinki University of Technology.
+ *
  * 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: dispatcher.c,v 1.38.2.4 2012/09/13 20:20:15 riz Exp $");
+__RCSID("$NetBSD: dispatcher.c,v 1.38.2.5 2014/11/03 19:18:09 msaitoh Exp $");
 #endif /* !lint */
 #include <sys/types.h>
 #include <sys/poll.h>
 #include <assert.h>
 #include <errno.h>
 #include <pthread.h>
 #include <puffs.h>
 #include <puffsdump.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 @@ -402,26 +402,34 @@ dispatch(struct puffs_cc *pcc)
 			if (pncookie && !error) {
 				if (pn == NULL)
 					pn = PU_CMAP(pu, auxt->pvnr_newnode);
 				pn->pn_nlookup++;
+			}
 			break;
+		}
 		case PUFFS_VN_OPEN:
+		{
 			struct puffs_vnmsg_open *auxt = auxbuf;
 			PUFFS_MAKECRED(pcr, &auxt->pvnr_cred);
 			if (pops->puffs_node_open2 != NULL) {
 				error = pops->puffs_node_open2(pu,
 				    opcookie, auxt->pvnr_mode, pcr,
 				    &auxt->pvnr_oflags);
 				break;
+			}
 			if (pops->puffs_node_open == NULL) {
 				error = 0;
 				break;
+			}
 			error = pops->puffs_node_open(pu,
 			    opcookie, auxt->pvnr_mode, pcr);
 			break;
+		}
 		case PUFFS_VN_CLOSE:
+		{
 			struct puffs_vnmsg_close *auxt = auxbuf;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puffs.h,v 1.119.4.4 2012/09/13 20:20:16 riz Exp $	*/
+/*	$NetBSD: puffs.h,v 1.119.4.5 2014/11/03 19:18:09 msaitoh 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.
 @@ -240,26 +240,28 @@ struct puffs_ops {
 	    int, size_t *, uint8_t *, size_t *, int, const struct puffs_cred *);
 	int (*puffs_node_deleteextattr)(struct puffs_usermount *,
 	    puffs_cookie_t, int, const char *, const struct puffs_cred *);
 	int (*puffs_node_getattr_ttl)(struct puffs_usermount *,
 	    puffs_cookie_t, struct vattr *, const struct puffs_cred *,
 	    struct timespec *);
 	int (*puffs_node_setattr_ttl)(struct puffs_usermount *,
 	    puffs_cookie_t, struct vattr *, const struct puffs_cred *,
 	    struct timespec *, int);
 	int (*puffs_node_write2)(struct puffs_usermount *, puffs_cookie_t,
 	    uint8_t *, off_t, size_t *, const struct puffs_cred *, int, int);
 	int (*puffs_node_reclaim2)(struct puffs_usermount *,
 	    puffs_cookie_t, int);
 	int (*puffs_node_open2)(struct puffs_usermount *,
 	    puffs_cookie_t, int, const struct puffs_cred *, int *);
 	void *puffs_ops_spare[28];
 };
 typedef	int (*pu_pathbuild_fn)(struct puffs_usermount *,
 			       const struct puffs_pathobj *,
 			       const struct puffs_pathobj *, size_t,
 			       struct puffs_pathobj *);
 typedef int (*pu_pathtransform_fn)(struct puffs_usermount *,
 				   const struct puffs_pathobj *,
 				   const struct puffs_cn *,
 				   struct puffs_pathobj *);
 typedef int (*pu_pathcmp_fn)(struct puffs_usermount *, struct puffs_pathobj *,
 @@ -400,27 +402,29 @@ enum {
 	int fsname##_node_deleteextattr(struct puffs_usermount *,	\
 	    puffs_cookie_t, int, const char *,				\
 	    const struct puffs_cred *);					\
 	int fsname##_node_getattr_ttl(struct puffs_usermount *,		\
 	    puffs_cookie_t, struct vattr *, const struct puffs_cred *,	\
 	    struct timespec *);						\
 	int fsname##_node_setattr_ttl(struct puffs_usermount *,		\
 	    puffs_cookie_t, struct vattr *, const struct puffs_cred *,	\
 	    struct timespec *, int);					\
 	int fsname##_node_write2(struct puffs_usermount *,		\
 	    puffs_cookie_t, uint8_t *, off_t, size_t *,			\
 	    const struct puffs_cred *, int, int);			\
 	int fsname##_node_reclaim2(struct puffs_usermount *,		\
-	    puffs_cookie_t, int);
+	    puffs_cookie_t, int);					\
 	int fsname##_node_open2(struct puffs_usermount *,		\
 	    puffs_cookie_t, int, const struct puffs_cred *, int *);
 #define PUFFSOP_INIT(ops)						\
     ops = malloc(sizeof(struct puffs_ops));				\
     memset(ops, 0, sizeof(struct puffs_ops))
 #define PUFFSOP_SET(ops, fsname, fsornode, opname)			\
     (ops)->puffs_##fsornode##_##opname = fsname##_##fsornode##_##opname
 #define PUFFSOP_SETFSNOP(ops, opname)					\
     (ops)->puffs_fs_##opname = puffs_fsnop_##opname
 PUFFSOP_PROTOS(puffs_null)	/* XXX */
 #define PNPATH(pnode)	((pnode)->pn_po.po_path)

 @@ -1,39 +1,39 @@
-.\"	$NetBSD: puffs_ops.3,v 1.29.4.4 2012/09/13 20:20:15 riz Exp $
+.\"	$NetBSD: puffs_ops.3,v 1.29.4.5 2014/11/03 19:18:09 msaitoh Exp $
 .\"
 .\" Copyright (c) 2007 Antti Kantee.  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.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS 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.
 .\"
-.Dd April 18, 2012
+.Dd April 16, 2014
 .Dt PUFFS_OPS 3
 .Os
 .Sh NAME
 .Nm puffs_ops
 .Nd puffs callback operations
 .Sh LIBRARY
 .Lb libpuffs
 .Sh SYNOPSIS
 .In puffs.h
 .Ft int
 .Fo puffs_fs_statvfs
 .Fa "struct puffs_usermount *pu" "struct statvfs *sbp"
 .Fc
 @@ -73,26 +73,31 @@
 .Fc
 .Ft int
 .Fo puffs_node_mknod
 .Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
 .Fa "struct puffs_newinfo *pni" "const struct puffs_cn *pcn"
 .Fa "const struct vattr *vap"
 .Fc
 .Ft int
 .Fo puffs_node_open
 .Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int mode"
 .Fa "const struct puffs_cred *pcr"
 .Fc
 .Ft int
 .Fo puffs_node_open2
 .Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int modep"
 .Fa "const struct puffs_cred *pcr" "int *oflags"
 .Fc
 .Ft int
 .Fo puffs_node_close
 .Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int flags"
 .Fa "const struct puffs_cred *pcr"
 .Fc
 .Ft int
 .Fo puffs_node_access
 .Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int mode"
 .Fa "const struct puffs_cred *pcr"
 .Fc
 .Ft int
 .Fo puffs_node_getattr
 .Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "struct vattr *vap"
 .Fa "const struct puffs_cred *pcr"
 @@ -472,36 +477,43 @@ A file node is created in the directory
 by any of the above callbacks.
 The name of the new file can be found from
 .Fa pcn
 and the attributes are specified by
 .Fa va
 and the cookie for the newly created node should be set in
 .Fa pni .
 The only difference between these three is that they create a regular
 file, directory and device special file, respectively.
 .Pp
 In case of mknod, the device identifier can be found in
 .Fa va-\*[Gt]va_rdev .
 .It Fn puffs_node_open "pu" "opc" "mode" "pcr"
 .It Fn puffs_node_open2 "pu" "opc" "mode" "pcr" "oflags"
 Open the node denoted by the cookie
 .Fa opc .
 The parameter
 .Fa mode
 specifies the flags that
 .Xr open 2
 was called with, e.g.
 .Dv O_APPEND
 and
 .Dv O_NONBLOCK .
 .Fn puffs_node_open2
 allows the filesystem to pass back information for the file in
 .Fa oflags .
 The only implemented flag for now is
 .Dv PUFFS_OPEN_IO_DIRECT
 that cause file read/write to bypass the page cache.
 .It Fn puffs_node_close "pu" "opc" "flags" "pcr"
 Close a node.
 The parameter
 .Fa flags
 parameter describes the flags that the file was opened with.
 .It Fn puffs_node_access "pu" "opc" "mode" "pcr"
 Check if the credentials of
 .Fa pcr
 have the right to perform the operation specified by
 .Fa mode
 onto the node
 .Fa opc .
 The argument

 @@ -1,14 +1,14 @@
-/*	$NetBSD: requests.c,v 1.23 2008/01/29 14:54:08 pooka Exp $	*/
+/*	$NetBSD: requests.c,v 1.23.28.1 2014/11/03 19:18:09 msaitoh Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Research Foundation of Helsinki University of Technology
+ *
  * 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
 @@ -20,27 +20,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: requests.c,v 1.23 2008/01/29 14:54:08 pooka Exp $");
+__RCSID("$NetBSD: requests.c,v 1.23.28.1 2014/11/03 19:18:09 msaitoh Exp $");
 #endif /* !lint */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <dev/putter/putter.h>
 #include <assert.h>
 #include <errno.h>
 #include <puffs.h>
 #include <stdio.h>
 @@ -199,41 +199,41 @@ puffs__fsframe_write(struct puffs_usermo
 /*ARGSUSED*/
 int
 puffs__fsframe_cmp(struct puffs_usermount *pu,
 	struct puffs_framebuf *pb1, struct puffs_framebuf *pb2, int *notresp)
+{
 	struct puffs_req *preq1, *preq2;
 	size_t winlen;
 	int rv;
 	/* map incoming preq */
 	winlen = sizeof(struct puffs_req);
 	rv = puffs_framebuf_getwindow(pb1, 0, (void *)&preq1, &winlen);
 	assert(rv == 0); /* frames are always at least puffs_req in size */
-	assert(winlen = sizeof(struct puffs_req));
+	assert(winlen == sizeof(struct puffs_req));
 	/*
 	 * Check if this is not a response in this slot.  That's the
 	 * likely case.
 	 */
 	if ((preq1->preq_opclass & PUFFSOPFLAG_ISRESPONSE) == 0) {
 		*notresp = 1;
 		return 0;
+	}
 	/* map second preq */
 	winlen = sizeof(struct puffs_req);
 	rv = puffs_framebuf_getwindow(pb2, 0, (void *)&preq2, &winlen);
 	assert(rv == 0); /* frames are always at least puffs_req in size */
-	assert(winlen = sizeof(struct puffs_req));
+	assert(winlen == sizeof(struct puffs_req));
 	/* then compare: resid equal? */
 	return preq1->preq_id != preq2->preq_id;
+}
 void
 puffs__fsframe_gotframe(struct puffs_usermount *pu, struct puffs_framebuf *pb)
+{
 	puffs_framebuf_seekset(pb, 0);
 	puffs__ml_dispatch(pu, pb);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puffs_msgif.h,v 1.77.8.2 2012/08/12 13:13:20 martin Exp $	*/
+/*	$NetBSD: puffs_msgif.h,v 1.77.8.3 2014/11/03 19:18:09 msaitoh 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.
 @@ -329,26 +329,29 @@ struct puffs_vfsmsg_nodetofh {
 struct puffs_vfsmsg_suspend {
 	struct puffs_req	pvfsr_pr;
 	int			pvfsr_status;
 };
 #define PUFFS_SUSPEND_START	0
 #define PUFFS_SUSPEND_SUSPENDED	1
 #define PUFFS_SUSPEND_RESUME	2
 #define PUFFS_SUSPEND_ERROR	3
 #define PUFFS_EXTATTRCTL_HASNODE	0x01
 #define PUFFS_EXTATTRCTL_HASATTRNAME	0x02
 #define	PUFFS_OPEN_IO_DIRECT	0x01
 struct puffs_vfsmsg_extattrctl {
 	struct puffs_req	pvfsr_pr;
 	int			pvfsr_cmd;			  /* OUT */
 	int			pvfsr_attrnamespace;		  /* OUT */
 	int			pvfsr_flags;			  /* OUT */
 	char			pvfsr_attrname[PUFFS_EXTNAMELEN]; /* OUT */
 };
 /*
  * aux structures for vnode operations.
  */
 @@ -389,26 +392,27 @@ struct puffs_vnmsg_mknod {
 	struct vattr		pvnr_va;		/* OUT	*/
 	puffs_cookie_t		pvnr_newnode;		/* IN	*/
 	/* Used only if PUFFS_KFLAG_CACHE_USE_TTL */
 	struct timespec		pvnr_va_ttl;		/* IN	*/
 	struct timespec		pvnr_cn_ttl;		/* IN	*/
 };
 struct puffs_vnmsg_open {
 	struct puffs_req	pvn_pr;
 	struct puffs_kcred	pvnr_cred;		/* OUT	*/
 	int			pvnr_mode;		/* OUT	*/
 	int			pvnr_oflags;		/* IN	*/
 };
 struct puffs_vnmsg_close {
 	struct puffs_req	pvn_pr;
 	struct puffs_kcred	pvnr_cred;		/* OUT	*/
 	int			pvnr_fflag;		/* OUT	*/
 };
 struct puffs_vnmsg_access {
 	struct puffs_req	pvn_pr;
 	struct puffs_kcred	pvnr_cred;		/* OUT	*/

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puffs_sys.h,v 1.78.8.2 2012/08/12 13:13:20 martin Exp $	*/
+/*	$NetBSD: puffs_sys.h,v 1.78.8.3 2014/11/03 19:18:09 msaitoh Exp $	*/
 /*
  * Copyright (c) 2005, 2006  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.
 @@ -183,26 +183,28 @@ struct puffs_mount {
 };
 #define PUFFSTAT_BEFOREINIT	0
 #define PUFFSTAT_MOUNTING	1
 #define PUFFSTAT_RUNNING	2
 #define PUFFSTAT_DYING		3 /* Do you want your possessions identified? */
 #define PNODE_NOREFS	0x001	/* no backend reference			*/
 #define PNODE_DYING	0x002	/* NOREFS + inactive			*/
 #define PNODE_FAF	0x004	/* issue all operations as FAF		*/
 #define PNODE_DOINACT 	0x008	/* if inactive-on-demand, call inactive */
 #define PNODE_SOPEXP	0x100	/* Node reclaim postponed in sop thread	*/
 #define PNODE_RDIRECT	0x200	/* bypass page cache on read		*/
 #define PNODE_WDIRECT	0x400	/* bypass page cache on write		*/
 #define PNODE_METACACHE_ATIME	0x10	/* cache atime metadata */
 #define PNODE_METACACHE_CTIME	0x20	/* cache atime metadata */
 #define PNODE_METACACHE_MTIME	0x40	/* cache atime metadata */
 #define PNODE_METACACHE_SIZE	0x80	/* cache atime metadata */
 #define PNODE_METACACHE_MASK	0xf0
 struct puffs_node {
 	struct genfs_node pn_gnode;	/* genfs glue			*/
 	kmutex_t	pn_mtx;
 	int		pn_refcount;
 	int		pn_nlookup;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puffs_vnops.c,v 1.163.2.4 2012/08/12 13:13:20 martin Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.163.2.5 2014/11/03 19:18:09 msaitoh 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,27 +20,27 @@
  * 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.163.2.4 2012/08/12 13:13:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.163.2.5 2014/11/03 19:18:09 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/lockf.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/kernel.h> /* For hz, hardclock_ticks */
 #include <uvm/uvm.h>
 @@ -861,46 +861,53 @@ puffs_vnop_mknod(void *v)
 int
 puffs_vnop_open(void *v)
+{
 	struct vop_open_args /* {
 		const struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		int a_mode;
 		kauth_cred_t a_cred;
 	} */ *ap = v;
 	PUFFS_MSG_VARS(vn, open);
 	struct vnode *vp = ap->a_vp;
 	struct puffs_mount *pmp = MPTOPUFFSMP(vp->v_mount);
 	struct puffs_node *pn = VPTOPP(vp);
 	int mode = ap->a_mode;
 	int error;
 	DPRINTF(("puffs_open: vp %p, mode 0x%x\n", vp, mode));
 	if (vp->v_type == VREG && mode & FWRITE && !EXISTSOP(pmp, WRITE))
 		ERROUT(EROFS);
 	if (!EXISTSOP(pmp, OPEN))
 		ERROUT(0);
 	PUFFS_MSG_ALLOC(vn, open);
 	open_msg->pvnr_mode = mode;
 	puffs_credcvt(&open_msg->pvnr_cred, ap->a_cred);
 	puffs_msg_setinfo(park_open, PUFFSOP_VN,
 	    PUFFS_VN_OPEN, VPTOPNC(vp));
 	PUFFS_MSG_ENQUEUEWAIT2(pmp, park_open, vp->v_data, NULL, error);
 	error = checkerr(pmp, error, __func__);
 	if (open_msg->pvnr_oflags & PUFFS_OPEN_IO_DIRECT) {
 		if (mode & FREAD)
 			pn->pn_stat |= PNODE_RDIRECT;
 		if (mode & FWRITE)
 			pn->pn_stat |= PNODE_WDIRECT;
+	}
  out:
 	DPRINTF(("puffs_open: returning %d\n", error));
 	PUFFS_MSG_RELEASE(open);
 	return error;
+}
 int
 puffs_vnop_close(void *v)
+{
 	struct vop_close_args /* {
 		const struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		int a_fflag;
 @@ -2155,42 +2162,45 @@ puffs_vnop_rename(void *v)
 int
 puffs_vnop_read(void *v)
+{
 	struct vop_read_args /* {
 		const struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		struct uio *a_uio;
 		int a_ioflag;
 		kauth_cred_t a_cred;
 	} */ *ap = v;
 	PUFFS_MSG_VARS(vn, read);
 	struct vnode *vp = ap->a_vp;
 	struct puffs_node *pn = VPTOPP(vp);
 	struct puffs_mount *pmp = MPTOPUFFSMP(vp->v_mount);
 	struct uio *uio = ap->a_uio;
 	size_t tomove, argsize;
 	vsize_t bytelen;
 	int error;
 	read_msg = NULL;
 	error = 0;
 	/* std sanity */
 	if (uio->uio_resid == 0)
 		return 0;
 	if (uio->uio_offset < 0)
 		return EINVAL;
-	if (vp->v_type == VREG && PUFFS_USE_PAGECACHE(pmp)) {
+	if (vp->v_type == VREG &&
 	    PUFFS_USE_PAGECACHE(pmp) &&
 	    !(pn->pn_stat & PNODE_RDIRECT)) {
 		const int advice = IO_ADV_DECODE(ap->a_ioflag);
 		while (uio->uio_resid > 0) {
 			if (vp->v_size <= uio->uio_offset) {
 				break;
+			}
 			bytelen = MIN(uio->uio_resid,
 			    vp->v_size - uio->uio_offset);
 			if (bytelen == 0)
 				break;
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
 			    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
 @@ -2275,27 +2285,29 @@ puffs_vnop_write(void *v)
 	struct puffs_mount *pmp = MPTOPUFFSMP(vp->v_mount);
 	struct uio *uio = ap->a_uio;
 	size_t tomove, argsize;
 	off_t oldoff, newoff, origoff;
 	vsize_t bytelen;
 	int error, uflags;
 	int ubcflags;
 	error = uflags = 0;
 	write_msg = NULL;
 	mutex_enter(&pn->pn_sizemtx);
-	if (vp->v_type == VREG && PUFFS_USE_PAGECACHE(pmp)) {
+	if (vp->v_type == VREG &&
 	    PUFFS_USE_PAGECACHE(pmp) &&
 	    !(pn->pn_stat & PNODE_WDIRECT)) {
 		ubcflags = UBC_WRITE | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp);
 		/*
 		 * userspace *should* be allowed to control this,
 		 * but with UBC it's a bit unclear how to handle it
 		 */
 		if (ap->a_ioflag & IO_APPEND)
 			uio->uio_offset = vp->v_size;
 		origoff = uio->uio_offset;
 		while (uio->uio_resid > 0) {
 			if (vp->v_mount->mnt_flag & MNT_RELATIME)
 				uflags |= PUFFS_UPDATEATIME;

 @@ -1,14 +1,14 @@
-/*  $NetBSD: msg.c,v 1.20.2.1 2012/08/12 13:13:21 martin Exp $ */
+/*  $NetBSD: msg.c,v 1.20.2.2 2014/11/03 19:18:09 msaitoh Exp $ */
 /*-
  *  Copyright (c) 2010 Emmanuel Dreyfus. 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.
+ *
 @@ -483,27 +483,30 @@ perfused_readframe(struct puffs_usermoun
 	struct fuse_out_header foh;
 	size_t len;
 	ssize_t readen;
 	void *data;
 	/*
 	 * Read the header
 	 */
 	len = sizeof(foh);
 	PUFFS_FRAMEBUF_GETWINDOW(pufbuf, 0, &data, &len);
 	switch (readen = recv(fd, data, len, MSG_NOSIGNAL|MSG_PEEK)) {
 	case 0:
-		perfused_panic();
+		DPRINTF("Filesystem exit\n");
 		/* NOTREACHED */
 		exit(0);
 		break;
 	case -1:
 		if (errno == EAGAIN)
 			return 0;
 		DWARN("%s: recv returned -1", __func__);
 		return errno;
 		/* NOTREACHED */
 		break;
 	default:
 		break;
+	}
 #ifdef PERFUSE_DEBUG
 	if (readen != (ssize_t)len)