 @@ -1,14 +1,14 @@
-/*	$NetBSD: dispatcher.c,v 1.30 2008/01/28 18:35:50 pooka Exp $	*/
+/*	$NetBSD: dispatcher.c,v 1.31 2008/03/20 15:28:03 pooka 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.30 2008/01/28 18:35:50 pooka Exp $");
+__RCSID("$NetBSD: dispatcher.c,v 1.31 2008/03/20 15:28:03 pooka Exp $");
 #endif /* !lint */
 #include <sys/types.h>
 #include <sys/poll.h>
 #include <assert.h>
 #include <errno.h>
 #ifdef PUFFS_WITH_THREADS
 #include <pthread.h>
 #endif
 #include <puffs.h>
 #include <puffsdump.h>
 #include <stdio.h>
 @@ -123,44 +123,62 @@ puffs_dispatch_exec(struct puffs_cc *pcc
 	} else {
 		rv = 0;
+	}
 	return rv;
+}
 static void
 dispatch(struct puffs_cc *pcc)
+{
 	struct puffs_usermount *pu = pcc->pcc_pu;
 	struct puffs_ops *pops = &pu->pu_ops;
 	struct puffs_req *preq = puffs__framebuf_getdataptr(pcc->pcc_pb);
-	void *auxbuf = preq; /* help with typecasting */
+	void *auxbuf; /* help with typecasting */
-	void *opcookie = preq->preq_cookie;
+	void *opcookie;
-	int error, buildpath;
+	int error = 0, buildpath;
 	/* XXX: smaller hammer, please */
 	if ((PUFFSOP_OPCLASS(preq->preq_opclass == PUFFSOP_VFS &&
 	    preq->preq_optype == PUFFS_VFS_VPTOFH)) ||
 	    (PUFFSOP_OPCLASS(preq->preq_opclass) == PUFFSOP_VN &&
 	    (preq->preq_optype == PUFFS_VN_READDIR
 	    || preq->preq_optype == PUFFS_VN_READ))) {
 		if (puffs_framebuf_reserve_space(pcc->pcc_pb,
 		    PUFFS_MSG_MAXSIZE) == -1)
 			error = errno;
 		preq = puffs__framebuf_getdataptr(pcc->pcc_pb);
+	}
 	auxbuf = preq;
 	opcookie = preq->preq_cookie;
 	assert((pcc->pcc_flags & PCC_DONE) == 0);
 	buildpath = pu->pu_flags & PUFFS_FLAG_BUILDPATH;
 	preq->preq_setbacks = 0;
 	if (pu->pu_flags & PUFFS_FLAG_OPDUMP)
 		puffsdump_req(preq);
 	puffs__cc_setcaller(pcc, preq->preq_pid, preq->preq_lid);
 	/* pre-operation */
 	if (pu->pu_oppre)
 		pu->pu_oppre(pu);
 	if (error)
 		goto out;
 	/* Execute actual operation */
 	if (PUFFSOP_OPCLASS(preq->preq_opclass) == PUFFSOP_VFS) {
 		switch (preq->preq_optype) {
 		case PUFFS_VFS_UNMOUNT:
+		{
 			struct puffs_vfsmsg_unmount *auxt = auxbuf;
 			PU_SETSTATE(pu, PUFFS_STATE_UNMOUNTING);
 			error = pops->puffs_fs_unmount(pu, auxt->pvfsr_flags);
 			if (!error)
 				PU_SETSTATE(pu, PUFFS_STATE_UNMOUNTED);
 			else
 				PU_SETSTATE(pu, PUFFS_STATE_RUNNING);
 @@ -889,20 +907,22 @@ dispatch(struct puffs_cc *pcc)
 	} else if (PUFFSOP_OPCLASS(preq->preq_opclass) == PUFFSOP_ERROR) {
 		struct puffs_error *perr = (void *)preq;
 		pu->pu_errnotify(pu, preq->preq_optype,
 		    perr->perr_error, perr->perr_str, preq->preq_cookie);
 		error = 0;
 	} else {
 		/*
 		 * I guess the kernel sees this one coming also
 		 */
 		error = EINVAL;
+	}
  out:
 	preq->preq_rv = error;
 	if (pu->pu_oppost)
 		pu->pu_oppost(pu);
 	pcc->pcc_flags |= PCC_DONE;
+}