 @@ -1,14 +1,14 @@
-/*	$NetBSD: ukfs.c,v 1.23 2009/04/06 03:27:39 pooka Exp $	*/
+/*	$NetBSD: ukfs.c,v 1.24 2009/04/26 22:23:01 pooka Exp $	*/
 /*
  * Copyright (c) 2007, 2008  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural 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
 @@ -288,84 +288,161 @@ ukfs_release(struct ukfs *fs, int flags)
+	}
 	free(fs);
+}
 #define STDCALL(ukfs, thecall)						\
 	int rv = 0;							\
+									\
 	precall(ukfs);							\
 	rv = thecall;							\
 	postcall(ukfs);							\
 	return rv;
 int
-ukfs_getdents(struct ukfs *ukfs, const char *dirname, off_t *off,
+ukfs_opendir(struct ukfs *ukfs, const char *dirname, struct ukfs_dircookie **c)
 	uint8_t *buf, size_t bufsize)
+{
 	struct uio *uio;
 	struct vnode *vp;
-	size_t resid;
+	int rv;
 	kauth_cred_t cred;
 	int rv, eofflag;
 	precall(ukfs);
 	rv = rump_namei(RUMP_NAMEI_LOOKUP, RUMP_NAMEI_LOCKLEAF, dirname,
 	    NULL, &vp, NULL);
 	postcall(ukfs);
 	if (rv)
-		goto out;
+	if (rv == 0) {
 		RUMP_VOP_UNLOCK(vp, 0);
 	} else {
 		errno = rv;
 		rv = -1;
+	}
 	/*LINTED*/
 	*c = (struct ukfs_dircookie *)vp;
 	return rv;
+}
 static int
 getmydents(struct vnode *vp, off_t *off, uint8_t *buf, size_t bufsize)
+{
 	struct uio *uio;
 	size_t resid;
 	int rv, eofflag;
 	kauth_cred_t cred;
 	uio = rump_uio_setup(buf, bufsize, *off, RUMPUIO_READ);
 	cred = rump_cred_suserget();
 	rv = RUMP_VOP_READDIR(vp, uio, cred, &eofflag, NULL, NULL);
 	rump_cred_suserput(cred);
 	RUMP_VOP_UNLOCK(vp, 0);
 	*off = rump_uio_getoff(uio);
 	resid = rump_uio_free(uio);
 	rump_vp_rele(vp);
  out:
 	if (rv) {
 		errno = rv;
 		return -1;
+	}
 	/* LINTED: not totally correct return type, but follows syscall */
 	return bufsize - resid;
+}
 /*ARGSUSED*/
 int
 ukfs_getdents_cookie(struct ukfs *ukfs, struct ukfs_dircookie *c, off_t *off,
 	uint8_t *buf, size_t bufsize)
+{
 	/*LINTED*/
 	struct vnode *vp = (struct vnode *)c;
 	RUMP_VOP_LOCK(vp, RUMP_LK_SHARED);
 	return getmydents(vp, off, buf, bufsize);
+}
 int
 ukfs_getdents(struct ukfs *ukfs, const char *dirname, off_t *off,
 	uint8_t *buf, size_t bufsize)
+{
 	struct vnode *vp;
 	int rv;
 	precall(ukfs);
 	rv = rump_namei(RUMP_NAMEI_LOOKUP, RUMP_NAMEI_LOCKLEAF, dirname,
 	    NULL, &vp, NULL);
 	postcall(ukfs);
 	if (rv) {
 		errno = rv;
 		return -1;
+	}
 	rv = getmydents(vp, off, buf, bufsize);
 	rump_vp_rele(vp);
 	return rv;
+}
 /*ARGSUSED*/
 int
 ukfs_closedir(struct ukfs *ukfs, struct ukfs_dircookie *c)
+{
 	/*LINTED*/
 	rump_vp_rele((struct vnode *)c);
 	return 0;
+}
 int
 ukfs_open(struct ukfs *ukfs, const char *filename, int flags)
+{
 	int fd;
 	precall(ukfs);
 	fd = rump_sys_open(filename, flags, 0);
 	postcall(ukfs);
 	if (fd == -1)
 		return -1;
 	return fd;
+}
 ssize_t
 ukfs_read(struct ukfs *ukfs, const char *filename, off_t off,
 	uint8_t *buf, size_t bufsize)
+{
 	int fd;
 	ssize_t xfer = -1; /* XXXgcc */
 	precall(ukfs);
 	fd = rump_sys_open(filename, RUMP_O_RDONLY, 0);
 	if (fd == -1)
 		goto out;
 	xfer = rump_sys_pread(fd, buf, bufsize, 0, off);
 	rump_sys_close(fd);
  out:
 	postcall(ukfs);
 	if (fd == -1) {
 		return -1;
+	}
 	return xfer;
+}
 /*ARGSUSED*/
 ssize_t
 ukfs_read_fd(struct ukfs *ukfs, int fd, off_t off, uint8_t *buf, size_t buflen)
+{
 	return rump_sys_pread(fd, buf, buflen, 0, off);
+}
 ssize_t
 ukfs_write(struct ukfs *ukfs, const char *filename, off_t off,
 	uint8_t *buf, size_t bufsize)
+{
 	int fd;
 	ssize_t xfer = -1; /* XXXgcc */
 	precall(ukfs);
 	fd = rump_sys_open(filename, RUMP_O_WRONLY, 0);
 	if (fd == -1)
 		goto out;
 	/* write and commit */
 @@ -373,26 +450,49 @@ ukfs_write(struct ukfs *ukfs, const char
 	if (xfer > 0)
 		rump_sys_fsync(fd);
 	rump_sys_close(fd);
  out:
 	postcall(ukfs);
 	if (fd == -1) {
 		return -1;
+	}
 	return xfer;
+}
 /*ARGSUSED*/
 ssize_t
 ukfs_write_fd(struct ukfs *ukfs, int fd, off_t off, uint8_t *buf, size_t buflen,
 	int dosync)
+{
 	ssize_t xfer;
 	xfer = rump_sys_pwrite(fd, buf, buflen, 0, off);
 	if (xfer > 0 && dosync)
 		rump_sys_fsync(fd);
 	return xfer;
+}
 /*ARGSUSED*/
 int
 ukfs_close(struct ukfs *ukfs, int fd)
+{
 	rump_sys_close(fd);
 	return 0;
+}
 int
 ukfs_create(struct ukfs *ukfs, const char *filename, mode_t mode)
+{
 	int fd;
 	precall(ukfs);
 	fd = rump_sys_open(filename, RUMP_O_WRONLY | RUMP_O_CREAT, mode);
 	if (fd == -1)
 		return -1;
 	rump_sys_close(fd);
 	postcall(ukfs);
 	return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ukfs.h,v 1.7 2008/10/07 23:16:59 pooka Exp $	*/
+/*	$NetBSD: ukfs.h,v 1.8 2009/04/26 22:23:01 pooka Exp $	*/
 /*
  * Copyright (c) 2007, 2008  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural 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
 @@ -31,47 +31,59 @@
 #ifndef _RUMP_UKFS_H_
 #define _RUMP_UKFS_H_
 #include <sys/types.h>
 #include <stdint.h>
 /* don't include NetBSD <sys/header.h> for portability */
 struct vnode;
 struct stat;
 struct timeval;
 struct ukfs;
 struct ukfs_dircookie;
 #define UKFS_DEFAULTMP "/"
 #define UKFS_RELFLAG_NOUNMOUNT	0x01
 #define UKFS_VERSION	001 /* sector 001 */
 #define	ukfs_init()	_ukfs_init(UKFS_VERSION)
 __BEGIN_DECLS
 int		_ukfs_init(int);
 struct ukfs	*ukfs_mount(const char *, const char *, const char *,
 			  int, void *, size_t);
 void		ukfs_release(struct ukfs *, int);
 int		ukfs_opendir(struct ukfs *, const char *,
 			     struct ukfs_dircookie **);
 int		ukfs_getdents(struct ukfs *, const char *, off_t *,
 			      uint8_t *, size_t);
 int		ukfs_getdents_cookie(struct ukfs *, struct ukfs_dircookie *,
 				     off_t *, uint8_t *, size_t);
 int		ukfs_closedir(struct ukfs *, struct ukfs_dircookie *);
 int		ukfs_open(struct ukfs *, const char *, int);
 ssize_t		ukfs_read(struct ukfs *, const char *, off_t,
 			      uint8_t *, size_t);
 ssize_t		ukfs_read_fd(struct ukfs *, int, off_t, uint8_t *, size_t);
 ssize_t		ukfs_write(struct ukfs *, const char *, off_t,
 			       uint8_t *, size_t);
 ssize_t		ukfs_write_fd(struct ukfs *, int, off_t, uint8_t *, size_t,int);
 int		ukfs_close(struct ukfs *, int);
 ssize_t		ukfs_readlink(struct ukfs *, const char *, char *, size_t);
 int		ukfs_create(struct ukfs *, const char *, mode_t);
 int		ukfs_mkdir(struct ukfs *, const char *, mode_t);
 int		ukfs_mknod(struct ukfs *, const char *, mode_t, dev_t);
 int		ukfs_mkfifo(struct ukfs *, const char *, mode_t);
 int		ukfs_symlink(struct ukfs *, const char *, const char *);
 int		ukfs_remove(struct ukfs *, const char *);
 int		ukfs_rmdir(struct ukfs *, const char *);
 int		ukfs_link(struct ukfs *, const char *, const char *);
 int		ukfs_rename(struct ukfs *, const char *, const char *);