 @@ -1,14 +1,14 @@
-/*	$NetBSD: fstest_ffs.c,v 1.2 2010/07/30 16:15:05 pooka Exp $	*/
+/*	$NetBSD: fstest_ffs.c,v 1.3 2011/01/07 11:52:59 pooka Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nicolas Joly.
+ *
  * 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.
 @@ -79,60 +79,70 @@ ffs_fstest_newfs(const atf_tc_t *tc, voi
 	args->ta_uargs.fspec = args->ta_devpath;
 	res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
 	if (res != 0) {
 		free(args);
 		return res;
+	}
 	*buf = args;
 	num++;
 	return 0;
+}
 __strong_alias(ffslog_fstest_newfs,ffs_fstest_newfs);
 int
 ffs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
 	int res;
 	struct ffstestargs *args = buf;
 	res = rump_pub_etfs_remove(args->ta_devpath);
 	if (res != 0)
 		return res;
 	res = unlink(args->ta_imgpath);
 	if (res != 0)
 		return res;
 	free(args);
 	return 0;
+}
 __strong_alias(ffslog_fstest_delfs,ffs_fstest_delfs);
 int
 ffs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
 	int res;
 	struct ffstestargs *args = buf;
 	res = rump_sys_mkdir(path, 0777);
 	if (res == -1)
 		return res;
 	res = rump_sys_mount(MOUNT_FFS, path, flags, &args->ta_uargs,
 	    sizeof(args->ta_uargs));
 	return res;
+}
 int
 ffslog_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
 	return ffs_fstest_mount(tc, buf, path, flags | MNT_LOG);
+}
 int
 ffs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
 	int res;
 	res = rump_sys_unmount(path, flags);
 	if (res == -1)
 		return res;
 	res = rump_sys_rmdir(path);
 	return res;
+}
 __strong_alias(ffslog_fstest_unmount,ffs_fstest_unmount);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: h_fsmacros.h,v 1.27 2011/01/07 11:41:40 pooka Exp $	*/
+/*	$NetBSD: h_fsmacros.h,v 1.28 2011/01/07 11:52:59 pooka Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nicolas Joly.
+ *
  * 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.
 @@ -41,26 +41,27 @@
 #include <rump/rump.h>
 #include "../../h_macros.h"
 #define FSPROTOS(_fs_)							\
 int _fs_##_fstest_newfs(const atf_tc_t *, void **, const char *,	\
 			off_t, void *);					\
 int _fs_##_fstest_delfs(const atf_tc_t *, void *);			\
 int _fs_##_fstest_mount(const atf_tc_t *, void *, const char *, int);	\
 int _fs_##_fstest_unmount(const atf_tc_t *, const char *, int);
 FSPROTOS(ext2fs);
 FSPROTOS(ffs);
 FSPROTOS(ffslog);
 FSPROTOS(lfs);
 FSPROTOS(msdosfs);
 FSPROTOS(nfs);
 FSPROTOS(nfsro);
 FSPROTOS(p2k_ffs);
 FSPROTOS(puffs);
 FSPROTOS(rumpfs);
 FSPROTOS(sysvbfs);
 FSPROTOS(tmpfs);
 #ifndef FSTEST_IMGNAME
 #define FSTEST_IMGNAME "image.fs"
 #endif
 @@ -159,69 +160,73 @@ do {									\
 	{								\
 		if (!atf_check_fstype(tc, _type_))			\
 			return;						\
 		if (_fs_##_fstest_delfs(tc, _fs_##_func_##tmp) != 0)	\
 			atf_tc_fail_errno("delfs failed");		\
+	}
 #define ATF_TP_FSADD(fs,func)						\
   ATF_TP_ADD_TC(tp,fs##_##func)
 #define ATF_TC_FSAPPLY(func,desc)					\
   ATF_TC_FSADD(ext2fs,MOUNT_EXT2FS,func,desc)				\
   ATF_TC_FSADD(ffs,MOUNT_FFS,func,desc)					\
   ATF_TC_FSADD(ffslog,MOUNT_FFS,func,desc)				\
   ATF_TC_FSADD(lfs,MOUNT_LFS,func,desc)					\
   ATF_TC_FSADD(msdosfs,MOUNT_MSDOS,func,desc)				\
   ATF_TC_FSADD(nfs,MOUNT_NFS,func,desc)					\
   ATF_TC_FSADD(p2k_ffs,MOUNT_PUFFS,func,desc)				\
   ATF_TC_FSADD(puffs,MOUNT_PUFFS,func,desc)				\
   ATF_TC_FSADD(rumpfs,MOUNT_RUMPFS,func,desc)				\
   ATF_TC_FSADD(sysvbfs,MOUNT_SYSVBFS,func,desc)				\
   ATF_TC_FSADD(tmpfs,MOUNT_TMPFS,func,desc)
 #define ATF_TP_FSAPPLY(func)						\
   ATF_TP_FSADD(ext2fs,func);						\
   ATF_TP_FSADD(ffs,func);						\
   ATF_TP_FSADD(ffslog,func);						\
   ATF_TP_FSADD(lfs,func);						\
   ATF_TP_FSADD(msdosfs,func);						\
   ATF_TP_FSADD(nfs,func);						\
   ATF_TP_FSADD(p2k_ffs,func);						\
   ATF_TP_FSADD(puffs,func);						\
   ATF_TP_FSADD(rumpfs,func);						\
   ATF_TP_FSADD(sysvbfs,func);						\
   ATF_TP_FSADD(tmpfs,func);
 /*
  * Same as above, but generate a file system image first and perform
  * tests for a r/o mount.
+ *
  * Missing the following file systems:
  *   + lfs (fstest_lfs routines cannot handle remount.  FIXME!)
  *   + tmpfs (memory backend)
  *   + rumpfs (memory backend)
  *   + puffs (memory backend, but could be run in theory)
  */
 #define ATF_TC_FSAPPLY_RO(func,desc,gen)				\
   ATF_TC_FSADD_RO(ext2fs,MOUNT_EXT2FS,func,desc,gen)			\
   ATF_TC_FSADD_RO(ffs,MOUNT_FFS,func,desc,gen)				\
   ATF_TC_FSADD_RO(ffslog,MOUNT_FFS,func,desc,gen)			\
   ATF_TC_FSADD_RO(msdosfs,MOUNT_MSDOS,func,desc,gen)			\
   ATF_TC_FSADD_RO(nfs,MOUNT_NFS,func,desc,gen)				\
   ATF_TC_FSADD_RO(nfsro,MOUNT_NFS,func,desc,gen)			\
   ATF_TC_FSADD_RO(sysvbfs,MOUNT_SYSVBFS,func,desc,gen)
 #define ATF_TP_FSAPPLY_RO(func)						\
   ATF_TP_FSADD(ext2fs,func);						\
   ATF_TP_FSADD(ffs,func);						\
   ATF_TP_FSADD(ffslog,func);						\
   ATF_TP_FSADD(msdosfs,func);						\
   ATF_TP_FSADD(nfs,func);						\
   ATF_TP_FSADD(nfsro,func);						\
   ATF_TP_FSADD(sysvbfs,func);
 #define ATF_FSAPPLY(func,desc)						\
 	ATF_TC_FSAPPLY(func,desc);					\
 	ATF_TP_ADD_TCS(tp)						\
 	{								\
 		ATF_TP_FSAPPLY(func);					\
 		return atf_no_error();					\
+	}
 @@ -233,26 +238,28 @@ atf_check_fstype(const atf_tc_t *tc, con
 	if (!atf_tc_has_config_var(tc, "fstype"))
 		return true;
 	fstype = atf_tc_get_config_var(tc, "fstype");
 	if (strcmp(fstype, fs) == 0)
 		return true;
 	return false;
+}
 #define FSTYPE_EXT2FS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ext2fs") == 0)
 #define FSTYPE_FFS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ffs") == 0)
 #define FSTYPE_FFSLOG(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ffs") == 0)
 #define FSTYPE_LFS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "lfs") == 0)
 #define FSTYPE_MSDOS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "msdosfs") == 0)
 #define FSTYPE_NFS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "nfs") == 0)
 #define FSTYPE_NFSRO(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "nfsro") == 0)
 #define FSTYPE_P2K_FFS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "p2k_ffs") == 0)
 #define FSTYPE_PUFFS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "puffs") == 0)
 #define FSTYPE_RUMPFS(tc)\