Fri Jan 7 11:41:55 2011 UTC ()
P2K_FFS uses puffs and therefore does not GOP_ALLOC either


(pooka)
diff -r1.4 -r1.5 src/tests/fs/vfs/t_full.c
cvs diff -r1.4 -r1.5 src/tests/fs/vfs/t_full.c (expand / switch to unified diff)

--- src/tests/fs/vfs/t_full.c 2010/11/11 17:44:44 1.4
+++ src/tests/fs/vfs/t_full.c 2011/01/07 11:41:54 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: t_full.c,v 1.4 2010/11/11 17:44:44 pooka Exp $ */ 1/* $NetBSD: t_full.c,v 1.5 2011/01/07 11:41:54 pooka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2010 The NetBSD Foundation, Inc. 4 * Copyright (c) 2010 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -46,27 +46,27 @@ @@ -46,27 +46,27 @@
46 * since we might just stuff data into the cache and miss the problem. 46 * since we might just stuff data into the cache and miss the problem.
47 */ 47 */
48#define NFSBONUS (1<<16) 48#define NFSBONUS (1<<16)
49 49
50static void 50static void
51fillfs(const atf_tc_t *tc, const char *mp) 51fillfs(const atf_tc_t *tc, const char *mp)
52{ 52{
53 char buf[8192]; 53 char buf[8192];
54 size_t written; 54 size_t written;
55 ssize_t n = 0; /* xxxgcc */ 55 ssize_t n = 0; /* xxxgcc */
56 size_t bonus; 56 size_t bonus;
57 int fd, i = 0; 57 int fd, i = 0;
58 58
59 if (FSTYPE_PUFFS(tc) || FSTYPE_RUMPFS(tc)) { 59 if (FSTYPE_P2K_FFS(tc) || FSTYPE_PUFFS(tc) || FSTYPE_RUMPFS(tc)) {
60 atf_tc_skip("fs does not support explicit block allocation " 60 atf_tc_skip("fs does not support explicit block allocation "
61 "(GOP_ALLOC)"); 61 "(GOP_ALLOC)");
62 } 62 }
63 63
64 bonus = 0; 64 bonus = 0;
65 if (FSTYPE_NFS(tc)) 65 if (FSTYPE_NFS(tc))
66 bonus = NFSBONUS; 66 bonus = NFSBONUS;
67 67
68 if (rump_sys_chdir(mp) == -1) 68 if (rump_sys_chdir(mp) == -1)
69 atf_tc_fail_errno("chdir mountpoint"); 69 atf_tc_fail_errno("chdir mountpoint");
70 fd = rump_sys_open("afile", O_CREAT | O_RDWR); 70 fd = rump_sys_open("afile", O_CREAT | O_RDWR);
71 if (fd == -1) 71 if (fd == -1)
72 atf_tc_fail_errno("create file"); 72 atf_tc_fail_errno("create file");