ffs_wapbl.c revision 1.13 1 1.13 bouyer /* $NetBSD: ffs_wapbl.c,v 1.13 2009/09/13 14:13:23 bouyer Exp $ */
2 1.2 simonb
3 1.2 simonb /*-
4 1.2 simonb * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
5 1.2 simonb * All rights reserved.
6 1.2 simonb *
7 1.2 simonb * This code is derived from software contributed to The NetBSD Foundation
8 1.2 simonb * by Wasabi Systems, Inc.
9 1.2 simonb *
10 1.2 simonb * Redistribution and use in source and binary forms, with or without
11 1.2 simonb * modification, are permitted provided that the following conditions
12 1.2 simonb * are met:
13 1.2 simonb * 1. Redistributions of source code must retain the above copyright
14 1.2 simonb * notice, this list of conditions and the following disclaimer.
15 1.2 simonb * 2. Redistributions in binary form must reproduce the above copyright
16 1.2 simonb * notice, this list of conditions and the following disclaimer in the
17 1.2 simonb * documentation and/or other materials provided with the distribution.
18 1.2 simonb *
19 1.2 simonb * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 1.2 simonb * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 1.2 simonb * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 1.2 simonb * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 1.2 simonb * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 1.2 simonb * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 1.2 simonb * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 1.2 simonb * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 1.2 simonb * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 1.2 simonb * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 1.2 simonb * POSSIBILITY OF SUCH DAMAGE.
30 1.2 simonb */
31 1.2 simonb
32 1.2 simonb #include <sys/cdefs.h>
33 1.13 bouyer __KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.13 2009/09/13 14:13:23 bouyer Exp $");
34 1.7 joerg
35 1.7 joerg #define WAPBL_INTERNAL
36 1.2 simonb
37 1.2 simonb #if defined(_KERNEL_OPT)
38 1.2 simonb #include "opt_ffs.h"
39 1.2 simonb #endif
40 1.2 simonb
41 1.2 simonb #include <sys/param.h>
42 1.2 simonb #include <sys/systm.h>
43 1.2 simonb #include <sys/kernel.h>
44 1.2 simonb #include <sys/vnode.h>
45 1.2 simonb #include <sys/mount.h>
46 1.2 simonb #include <sys/file.h>
47 1.2 simonb #include <sys/disk.h>
48 1.2 simonb #include <sys/disklabel.h>
49 1.2 simonb #include <sys/ioctl.h>
50 1.2 simonb #include <sys/errno.h>
51 1.2 simonb #include <sys/kauth.h>
52 1.2 simonb #include <sys/wapbl.h>
53 1.2 simonb
54 1.2 simonb #include <ufs/ufs/inode.h>
55 1.2 simonb #include <ufs/ufs/quota.h>
56 1.2 simonb #include <ufs/ufs/ufsmount.h>
57 1.2 simonb #include <ufs/ufs/ufs_bswap.h>
58 1.2 simonb #include <ufs/ufs/ufs_extern.h>
59 1.2 simonb #include <ufs/ufs/ufs_wapbl.h>
60 1.2 simonb
61 1.2 simonb #include <ufs/ffs/fs.h>
62 1.2 simonb #include <ufs/ffs/ffs_extern.h>
63 1.2 simonb
64 1.2 simonb #undef WAPBL_DEBUG
65 1.2 simonb #ifdef WAPBL_DEBUG
66 1.2 simonb int ffs_wapbl_debug = 1;
67 1.2 simonb #define DPRINTF(fmt, args...) \
68 1.2 simonb do { \
69 1.2 simonb if (ffs_wapbl_debug) \
70 1.2 simonb printf("%s:%d "fmt, __func__ , __LINE__, ##args); \
71 1.2 simonb } while (/* CONSTCOND */0)
72 1.2 simonb #else
73 1.2 simonb #define DPRINTF(fmt, args...) \
74 1.2 simonb do { \
75 1.2 simonb /* nothing */ \
76 1.2 simonb } while (/* CONSTCOND */0)
77 1.2 simonb #endif
78 1.2 simonb
79 1.4 simonb static int ffs_superblock_layout(struct fs *);
80 1.2 simonb static int wapbl_log_position(struct mount *, struct fs *, struct vnode *,
81 1.2 simonb daddr_t *, size_t *, size_t *, uint64_t *);
82 1.2 simonb static int wapbl_create_infs_log(struct mount *, struct fs *, struct vnode *,
83 1.2 simonb daddr_t *, size_t *, size_t *, uint64_t *);
84 1.2 simonb static void wapbl_find_log_start(struct mount *, struct vnode *, off_t,
85 1.2 simonb daddr_t *, daddr_t *, size_t *);
86 1.2 simonb static int wapbl_remove_log(struct mount *);
87 1.2 simonb static int wapbl_allocate_log_file(struct mount *, struct vnode *);
88 1.2 simonb
89 1.2 simonb /*
90 1.4 simonb * Return the super block layout format - UFS1 or UFS2.
91 1.4 simonb * WAPBL only works with UFS2 layout (which is still available
92 1.4 simonb * with FFSv1).
93 1.4 simonb *
94 1.4 simonb * XXX Should this be in ufs/ffs/fs.h? Same style of check is
95 1.4 simonb * also used in ffs_alloc.c in a few places.
96 1.4 simonb */
97 1.4 simonb static int
98 1.4 simonb ffs_superblock_layout(struct fs *fs)
99 1.4 simonb {
100 1.4 simonb if ((fs->fs_magic == FS_UFS1_MAGIC) &&
101 1.4 simonb ((fs->fs_old_flags & FS_FLAGS_UPDATED) == 0))
102 1.4 simonb return 1;
103 1.4 simonb else
104 1.4 simonb return 2;
105 1.4 simonb }
106 1.4 simonb
107 1.4 simonb /*
108 1.2 simonb * This function is invoked after a log is replayed to
109 1.2 simonb * disk to perform logical cleanup actions as described by
110 1.2 simonb * the log
111 1.2 simonb */
112 1.2 simonb void
113 1.2 simonb ffs_wapbl_replay_finish(struct mount *mp)
114 1.2 simonb {
115 1.2 simonb struct wapbl_replay *wr = mp->mnt_wapbl_replay;
116 1.2 simonb int i;
117 1.2 simonb int error;
118 1.2 simonb
119 1.2 simonb if (!wr)
120 1.2 simonb return;
121 1.2 simonb
122 1.2 simonb KDASSERT((mp->mnt_flag & MNT_RDONLY) == 0);
123 1.2 simonb
124 1.2 simonb for (i = 0; i < wr->wr_inodescnt; i++) {
125 1.2 simonb struct vnode *vp;
126 1.2 simonb struct inode *ip;
127 1.2 simonb error = VFS_VGET(mp, wr->wr_inodes[i].wr_inumber, &vp);
128 1.2 simonb if (error) {
129 1.2 simonb printf("ffs_wapbl_replay_finish: "
130 1.2 simonb "unable to cleanup inode %" PRIu32 "\n",
131 1.2 simonb wr->wr_inodes[i].wr_inumber);
132 1.2 simonb continue;
133 1.2 simonb }
134 1.2 simonb ip = VTOI(vp);
135 1.2 simonb KDASSERT(wr->wr_inodes[i].wr_inumber == ip->i_number);
136 1.6 joerg #ifdef WAPBL_DEBUG
137 1.2 simonb printf("ffs_wapbl_replay_finish: "
138 1.2 simonb "cleaning inode %" PRIu64 " size=%" PRIu64 " mode=%o nlink=%d\n",
139 1.2 simonb ip->i_number, ip->i_size, ip->i_mode, ip->i_nlink);
140 1.6 joerg #endif
141 1.2 simonb KASSERT(ip->i_nlink == 0);
142 1.2 simonb
143 1.2 simonb /*
144 1.2 simonb * The journal may have left partially allocated inodes in mode
145 1.2 simonb * zero. This may occur if a crash occurs betweeen the node
146 1.2 simonb * allocation in ffs_nodeallocg and when the node is properly
147 1.2 simonb * initialized in ufs_makeinode. If so, just dallocate them.
148 1.2 simonb */
149 1.2 simonb if (ip->i_mode == 0) {
150 1.2 simonb UFS_WAPBL_BEGIN(mp);
151 1.2 simonb ffs_vfree(vp, ip->i_number, wr->wr_inodes[i].wr_imode);
152 1.2 simonb UFS_WAPBL_END(mp);
153 1.2 simonb }
154 1.2 simonb vput(vp);
155 1.2 simonb }
156 1.8 joerg wapbl_replay_stop(wr);
157 1.2 simonb wapbl_replay_free(wr);
158 1.8 joerg mp->mnt_wapbl_replay = NULL;
159 1.2 simonb }
160 1.2 simonb
161 1.2 simonb /* Callback for wapbl */
162 1.2 simonb void
163 1.2 simonb ffs_wapbl_sync_metadata(struct mount *mp, daddr_t *deallocblks,
164 1.2 simonb int *dealloclens, int dealloccnt)
165 1.2 simonb {
166 1.2 simonb struct ufsmount *ump = VFSTOUFS(mp);
167 1.2 simonb struct fs *fs = ump->um_fs;
168 1.2 simonb int i, error;
169 1.2 simonb
170 1.2 simonb #ifdef WAPBL_DEBUG_INODES
171 1.2 simonb ufs_wapbl_verify_inodes(mp, "ffs_wapbl_sync_metadata");
172 1.2 simonb #endif
173 1.2 simonb
174 1.2 simonb for (i = 0; i< dealloccnt; i++) {
175 1.2 simonb /*
176 1.2 simonb * blkfree errors are unreported, might silently fail
177 1.2 simonb * if it cannot read the cylinder group block
178 1.2 simonb */
179 1.2 simonb ffs_blkfree(fs, ump->um_devvp,
180 1.2 simonb dbtofsb(fs, deallocblks[i]), dealloclens[i], -1);
181 1.2 simonb }
182 1.2 simonb
183 1.2 simonb fs->fs_fmod = 0;
184 1.2 simonb fs->fs_time = time_second;
185 1.2 simonb error = ffs_cgupdate(ump, 0);
186 1.2 simonb KASSERT(error == 0);
187 1.2 simonb }
188 1.2 simonb
189 1.2 simonb void
190 1.2 simonb ffs_wapbl_abort_sync_metadata(struct mount *mp, daddr_t *deallocblks,
191 1.2 simonb int *dealloclens, int dealloccnt)
192 1.2 simonb {
193 1.2 simonb struct ufsmount *ump = VFSTOUFS(mp);
194 1.2 simonb struct fs *fs = ump->um_fs;
195 1.2 simonb int i;
196 1.2 simonb
197 1.2 simonb for (i = 0; i < dealloccnt; i++) {
198 1.2 simonb /*
199 1.2 simonb * Since the above blkfree may have failed, this blkalloc might
200 1.2 simonb * fail as well, so don't check its error. Note that if the
201 1.2 simonb * blkfree succeeded above, then this shouldn't fail because
202 1.2 simonb * the buffer will be locked in the current transaction.
203 1.2 simonb */
204 1.9 joerg ffs_blkalloc_ump(ump, dbtofsb(fs, deallocblks[i]),
205 1.2 simonb dealloclens[i]);
206 1.2 simonb }
207 1.2 simonb }
208 1.2 simonb
209 1.2 simonb static int
210 1.2 simonb wapbl_remove_log(struct mount *mp)
211 1.2 simonb {
212 1.2 simonb struct ufsmount *ump = VFSTOUFS(mp);
213 1.2 simonb struct fs *fs = ump->um_fs;
214 1.2 simonb struct vnode *vp;
215 1.2 simonb struct inode *ip;
216 1.2 simonb ino_t log_ino;
217 1.2 simonb int error;
218 1.2 simonb
219 1.4 simonb /* If super block layout is too old to support WAPBL, return */
220 1.4 simonb if (ffs_superblock_layout(fs) < 2)
221 1.4 simonb return 0;
222 1.4 simonb
223 1.2 simonb /* If all the log locators are 0, just clean up */
224 1.2 simonb if (fs->fs_journallocs[0] == 0 &&
225 1.2 simonb fs->fs_journallocs[1] == 0 &&
226 1.2 simonb fs->fs_journallocs[2] == 0 &&
227 1.2 simonb fs->fs_journallocs[3] == 0) {
228 1.2 simonb DPRINTF("empty locators, just clear\n");
229 1.2 simonb goto done;
230 1.2 simonb }
231 1.2 simonb
232 1.2 simonb switch (fs->fs_journal_location) {
233 1.2 simonb case UFS_WAPBL_JOURNALLOC_NONE:
234 1.2 simonb /* nothing! */
235 1.2 simonb DPRINTF("no log\n");
236 1.2 simonb break;
237 1.2 simonb
238 1.2 simonb case UFS_WAPBL_JOURNALLOC_IN_FILESYSTEM:
239 1.2 simonb log_ino = fs->fs_journallocs[UFS_WAPBL_INFS_INO];
240 1.2 simonb DPRINTF("in-fs log, ino = %" PRId64 "\n",log_ino);
241 1.2 simonb
242 1.2 simonb /* if no existing log inode, just clear all fields and bail */
243 1.2 simonb if (log_ino == 0)
244 1.2 simonb goto done;
245 1.2 simonb error = VFS_VGET(mp, log_ino, &vp);
246 1.2 simonb if (error != 0) {
247 1.2 simonb printf("ffs_wapbl: vget failed %d\n",
248 1.2 simonb error);
249 1.2 simonb /* clear out log info on error */
250 1.2 simonb goto done;
251 1.2 simonb }
252 1.2 simonb ip = VTOI(vp);
253 1.2 simonb KASSERT(log_ino == ip->i_number);
254 1.2 simonb if ((ip->i_flags & SF_LOG) == 0) {
255 1.2 simonb printf("ffs_wapbl: try to clear non-log inode "
256 1.2 simonb "%" PRId64 "\n", log_ino);
257 1.2 simonb vput(vp);
258 1.2 simonb /* clear out log info on error */
259 1.2 simonb goto done;
260 1.2 simonb }
261 1.2 simonb
262 1.2 simonb /*
263 1.2 simonb * remove the log inode by setting its link count back
264 1.2 simonb * to zero and bail.
265 1.2 simonb */
266 1.2 simonb ip->i_nlink = 0;
267 1.2 simonb DIP_ASSIGN(ip, nlink, 0);
268 1.2 simonb vput(vp);
269 1.2 simonb
270 1.2 simonb case UFS_WAPBL_JOURNALLOC_END_PARTITION:
271 1.2 simonb DPRINTF("end-of-partition log\n");
272 1.2 simonb /* no extra work required */
273 1.2 simonb break;
274 1.2 simonb
275 1.2 simonb default:
276 1.2 simonb printf("ffs_wapbl: unknown journal type %d\n",
277 1.2 simonb fs->fs_journal_location);
278 1.13 bouyer break;
279 1.2 simonb }
280 1.2 simonb
281 1.2 simonb
282 1.2 simonb done:
283 1.2 simonb /* Clear out all previous knowledge of journal */
284 1.2 simonb fs->fs_journal_version = 0;
285 1.2 simonb fs->fs_journal_location = 0;
286 1.2 simonb fs->fs_journal_flags = 0;
287 1.2 simonb fs->fs_journallocs[0] = 0;
288 1.2 simonb fs->fs_journallocs[1] = 0;
289 1.2 simonb fs->fs_journallocs[2] = 0;
290 1.2 simonb fs->fs_journallocs[3] = 0;
291 1.2 simonb (void) ffs_sbupdate(ump, MNT_WAIT);
292 1.2 simonb
293 1.2 simonb return 0;
294 1.2 simonb }
295 1.2 simonb
296 1.2 simonb int
297 1.2 simonb ffs_wapbl_start(struct mount *mp)
298 1.2 simonb {
299 1.2 simonb struct ufsmount *ump = VFSTOUFS(mp);
300 1.2 simonb struct fs *fs = ump->um_fs;
301 1.2 simonb struct vnode *devvp = ump->um_devvp;
302 1.2 simonb daddr_t off;
303 1.2 simonb size_t count;
304 1.2 simonb size_t blksize;
305 1.2 simonb uint64_t extradata;
306 1.2 simonb int error;
307 1.2 simonb
308 1.11 yamt if (mp->mnt_wapbl == NULL) {
309 1.2 simonb if (fs->fs_journal_flags & UFS_WAPBL_FLAGS_CLEAR_LOG) {
310 1.2 simonb /* Clear out any existing journal file */
311 1.2 simonb error = wapbl_remove_log(mp);
312 1.2 simonb if (error != 0)
313 1.2 simonb return error;
314 1.2 simonb }
315 1.2 simonb
316 1.2 simonb if (mp->mnt_flag & MNT_LOG) {
317 1.2 simonb KDASSERT(fs->fs_ronly == 0);
318 1.2 simonb
319 1.4 simonb /* WAPBL needs UFS2 format super block */
320 1.4 simonb if (ffs_superblock_layout(fs) < 2) {
321 1.4 simonb printf("%s fs superblock in old format, "
322 1.4 simonb "not journaling\n",
323 1.4 simonb VFSTOUFS(mp)->um_fs->fs_fsmnt);
324 1.4 simonb mp->mnt_flag &= ~MNT_LOG;
325 1.4 simonb return EINVAL;
326 1.4 simonb }
327 1.4 simonb
328 1.2 simonb error = wapbl_log_position(mp, fs, devvp, &off,
329 1.2 simonb &count, &blksize, &extradata);
330 1.2 simonb if (error)
331 1.2 simonb return error;
332 1.2 simonb
333 1.2 simonb /* XXX any other consistancy checks here? */
334 1.2 simonb if (blksize != DEV_BSIZE) {
335 1.5 pooka printf("%s: bad blocksize %zu\n", __func__,
336 1.2 simonb blksize);
337 1.2 simonb return EINVAL;
338 1.2 simonb }
339 1.2 simonb
340 1.2 simonb error = wapbl_start(&mp->mnt_wapbl, mp, devvp, off,
341 1.2 simonb count, blksize, mp->mnt_wapbl_replay,
342 1.2 simonb ffs_wapbl_sync_metadata,
343 1.2 simonb ffs_wapbl_abort_sync_metadata);
344 1.2 simonb if (error)
345 1.2 simonb return error;
346 1.2 simonb
347 1.2 simonb mp->mnt_wapbl_op = &wapbl_ops;
348 1.2 simonb
349 1.2 simonb #ifdef WAPBL_DEBUG
350 1.2 simonb printf("%s: enabling logging\n", fs->fs_fsmnt);
351 1.2 simonb #endif
352 1.2 simonb
353 1.2 simonb if ((fs->fs_flags & FS_DOWAPBL) == 0) {
354 1.2 simonb UFS_WAPBL_BEGIN(mp);
355 1.2 simonb fs->fs_flags |= FS_DOWAPBL;
356 1.2 simonb error = ffs_sbupdate(ump, MNT_WAIT);
357 1.2 simonb if (error) {
358 1.2 simonb UFS_WAPBL_END(mp);
359 1.2 simonb ffs_wapbl_stop(mp, MNT_FORCE);
360 1.2 simonb return error;
361 1.2 simonb }
362 1.2 simonb UFS_WAPBL_END(mp);
363 1.2 simonb error = wapbl_flush(mp->mnt_wapbl, 1);
364 1.2 simonb if (error) {
365 1.2 simonb ffs_wapbl_stop(mp, MNT_FORCE);
366 1.2 simonb return error;
367 1.2 simonb }
368 1.2 simonb }
369 1.2 simonb } else if (fs->fs_flags & FS_DOWAPBL) {
370 1.2 simonb fs->fs_fmod = 1;
371 1.2 simonb fs->fs_flags &= ~FS_DOWAPBL;
372 1.2 simonb }
373 1.2 simonb }
374 1.2 simonb
375 1.2 simonb /*
376 1.2 simonb * It is recommended that you finish replay with logging enabled.
377 1.2 simonb * However, even if logging is not enabled, the remaining log
378 1.2 simonb * replay should be safely recoverable with an fsck, so perform
379 1.2 simonb * it anyway.
380 1.2 simonb */
381 1.2 simonb if ((fs->fs_ronly == 0) && mp->mnt_wapbl_replay) {
382 1.2 simonb int saveflag = mp->mnt_flag & MNT_RDONLY;
383 1.2 simonb /*
384 1.2 simonb * Make sure MNT_RDONLY is not set so that the inode
385 1.2 simonb * cleanup in ufs_inactive will actually do its work.
386 1.2 simonb */
387 1.2 simonb mp->mnt_flag &= ~MNT_RDONLY;
388 1.2 simonb ffs_wapbl_replay_finish(mp);
389 1.2 simonb mp->mnt_flag |= saveflag;
390 1.2 simonb KASSERT(fs->fs_ronly == 0);
391 1.2 simonb }
392 1.2 simonb
393 1.2 simonb return 0;
394 1.2 simonb }
395 1.2 simonb
396 1.2 simonb int
397 1.2 simonb ffs_wapbl_stop(struct mount *mp, int force)
398 1.2 simonb {
399 1.2 simonb struct ufsmount *ump = VFSTOUFS(mp);
400 1.2 simonb struct fs *fs = ump->um_fs;
401 1.2 simonb int error;
402 1.2 simonb
403 1.2 simonb if (mp->mnt_wapbl) {
404 1.2 simonb KDASSERT(fs->fs_ronly == 0);
405 1.2 simonb
406 1.2 simonb /*
407 1.2 simonb * Make sure turning off FS_DOWAPBL is only removed
408 1.2 simonb * as the only change in the final flush since otherwise
409 1.2 simonb * a transaction may reorder writes.
410 1.2 simonb */
411 1.2 simonb error = wapbl_flush(mp->mnt_wapbl, 1);
412 1.2 simonb if (error && !force)
413 1.2 simonb return error;
414 1.2 simonb if (error && force)
415 1.2 simonb goto forceout;
416 1.2 simonb error = UFS_WAPBL_BEGIN(mp);
417 1.2 simonb if (error && !force)
418 1.2 simonb return error;
419 1.2 simonb if (error && force)
420 1.2 simonb goto forceout;
421 1.2 simonb KASSERT(fs->fs_flags & FS_DOWAPBL);
422 1.2 simonb
423 1.2 simonb fs->fs_flags &= ~FS_DOWAPBL;
424 1.2 simonb error = ffs_sbupdate(ump, MNT_WAIT);
425 1.2 simonb KASSERT(error == 0); /* XXX a bit drastic! */
426 1.2 simonb UFS_WAPBL_END(mp);
427 1.2 simonb forceout:
428 1.2 simonb error = wapbl_stop(mp->mnt_wapbl, force);
429 1.2 simonb if (error) {
430 1.2 simonb KASSERT(!force);
431 1.2 simonb fs->fs_flags |= FS_DOWAPBL;
432 1.2 simonb return error;
433 1.2 simonb }
434 1.2 simonb fs->fs_flags &= ~FS_DOWAPBL; /* Repeat in case of forced error */
435 1.11 yamt mp->mnt_wapbl = NULL;
436 1.2 simonb
437 1.2 simonb #ifdef WAPBL_DEBUG
438 1.2 simonb printf("%s: disabled logging\n", fs->fs_fsmnt);
439 1.2 simonb #endif
440 1.2 simonb }
441 1.2 simonb
442 1.2 simonb return 0;
443 1.2 simonb }
444 1.2 simonb
445 1.2 simonb int
446 1.2 simonb ffs_wapbl_replay_start(struct mount *mp, struct fs *fs, struct vnode *devvp)
447 1.2 simonb {
448 1.2 simonb int error;
449 1.2 simonb daddr_t off;
450 1.2 simonb size_t count;
451 1.2 simonb size_t blksize;
452 1.2 simonb uint64_t extradata;
453 1.2 simonb
454 1.4 simonb /*
455 1.4 simonb * WAPBL needs UFS2 format super block, if we got here with a
456 1.4 simonb * UFS1 format super block something is amiss...
457 1.4 simonb */
458 1.4 simonb if (ffs_superblock_layout(fs) < 2)
459 1.4 simonb return EINVAL;
460 1.4 simonb
461 1.2 simonb error = wapbl_log_position(mp, fs, devvp, &off, &count, &blksize,
462 1.2 simonb &extradata);
463 1.2 simonb
464 1.2 simonb if (error)
465 1.2 simonb return error;
466 1.2 simonb
467 1.2 simonb error = wapbl_replay_start(&mp->mnt_wapbl_replay, devvp, off,
468 1.2 simonb count, blksize);
469 1.2 simonb if (error)
470 1.2 simonb return error;
471 1.2 simonb
472 1.2 simonb mp->mnt_wapbl_op = &wapbl_ops;
473 1.2 simonb
474 1.2 simonb return 0;
475 1.2 simonb }
476 1.2 simonb
477 1.2 simonb /*
478 1.2 simonb * If the superblock doesn't already have a recorded journal location
479 1.2 simonb * then we allocate the journal in one of two positions:
480 1.2 simonb *
481 1.2 simonb * - At the end of the partition after the filesystem if there's
482 1.2 simonb * enough space. "Enough space" is defined as >= 1MB of journal
483 1.2 simonb * per 1GB of filesystem or 64MB, whichever is smaller.
484 1.2 simonb *
485 1.2 simonb * - Inside the filesystem. We try to allocate a contiguous journal
486 1.2 simonb * based on the total filesystem size - the target is 1MB of journal
487 1.2 simonb * per 1GB of filesystem, up to a maximum journal size of 64MB. As
488 1.2 simonb * a worst case allowing for fragmentation, we'll allocate a journal
489 1.2 simonb * 1/4 of the desired size but never smaller than 1MB.
490 1.2 simonb *
491 1.2 simonb * XXX In the future if we allow for non-contiguous journal files we
492 1.2 simonb * can tighten the above restrictions.
493 1.2 simonb *
494 1.2 simonb * XXX
495 1.2 simonb * These seems like a lot of duplication both here and in some of
496 1.2 simonb * the userland tools (fsck_ffs, dumpfs, tunefs) with similar
497 1.2 simonb * "switch (fs_journal_location)" constructs. Can we centralise
498 1.2 simonb * this sort of code somehow/somewhere?
499 1.2 simonb */
500 1.2 simonb static int
501 1.2 simonb wapbl_log_position(struct mount *mp, struct fs *fs, struct vnode *devvp,
502 1.2 simonb daddr_t *startp, size_t *countp, size_t *blksizep, uint64_t *extradatap)
503 1.2 simonb {
504 1.2 simonb struct ufsmount *ump = VFSTOUFS(mp);
505 1.2 simonb struct partinfo dpart;
506 1.2 simonb daddr_t logstart, logend, desired_logsize;
507 1.2 simonb size_t blksize;
508 1.2 simonb int error;
509 1.2 simonb
510 1.2 simonb if (fs->fs_journal_version == UFS_WAPBL_VERSION) {
511 1.2 simonb switch (fs->fs_journal_location) {
512 1.2 simonb case UFS_WAPBL_JOURNALLOC_END_PARTITION:
513 1.2 simonb DPRINTF("found existing end-of-partition log\n");
514 1.2 simonb *startp = fs->fs_journallocs[UFS_WAPBL_EPART_ADDR];
515 1.2 simonb *countp = fs->fs_journallocs[UFS_WAPBL_EPART_COUNT];
516 1.2 simonb *blksizep = fs->fs_journallocs[UFS_WAPBL_EPART_BLKSZ];
517 1.5 pooka DPRINTF(" start = %" PRId64 ", size = %zu, "
518 1.5 pooka "blksize = %zu\n", *startp, *countp, *blksizep);
519 1.2 simonb return 0;
520 1.2 simonb
521 1.2 simonb case UFS_WAPBL_JOURNALLOC_IN_FILESYSTEM:
522 1.2 simonb DPRINTF("found existing in-filesystem log\n");
523 1.2 simonb *startp = fs->fs_journallocs[UFS_WAPBL_INFS_ADDR];
524 1.2 simonb *countp = fs->fs_journallocs[UFS_WAPBL_INFS_COUNT];
525 1.2 simonb *blksizep = fs->fs_journallocs[UFS_WAPBL_INFS_BLKSZ];
526 1.5 pooka DPRINTF(" start = %" PRId64 ", size = %zu, "
527 1.5 pooka "blksize = %zu\n", *startp, *countp, *blksizep);
528 1.2 simonb return 0;
529 1.2 simonb
530 1.2 simonb default:
531 1.2 simonb printf("ffs_wapbl: unknown journal type %d\n",
532 1.2 simonb fs->fs_journal_location);
533 1.2 simonb return EINVAL;
534 1.2 simonb }
535 1.2 simonb }
536 1.2 simonb
537 1.2 simonb desired_logsize =
538 1.2 simonb lfragtosize(fs, fs->fs_size) / UFS_WAPBL_JOURNAL_SCALE;
539 1.2 simonb DPRINTF("desired log size = %" PRId64 " kB\n", desired_logsize / 1024);
540 1.2 simonb desired_logsize = max(desired_logsize, UFS_WAPBL_MIN_JOURNAL_SIZE);
541 1.2 simonb desired_logsize = min(desired_logsize, UFS_WAPBL_MAX_JOURNAL_SIZE);
542 1.2 simonb DPRINTF("adjusted desired log size = %" PRId64 " kB\n",
543 1.2 simonb desired_logsize / 1024);
544 1.2 simonb
545 1.2 simonb /* Is there space after after filesystem on partition for log? */
546 1.2 simonb logstart = fsbtodb(fs, fs->fs_size);
547 1.2 simonb error = VOP_IOCTL(devvp, DIOCGPART, &dpart, FREAD, FSCRED);
548 1.2 simonb if (!error) {
549 1.2 simonb logend = dpart.part->p_size;
550 1.2 simonb blksize = dpart.disklab->d_secsize;
551 1.2 simonb } else {
552 1.2 simonb struct dkwedge_info dkw;
553 1.2 simonb error = VOP_IOCTL(devvp, DIOCGWEDGEINFO, &dkw, FREAD, FSCRED);
554 1.2 simonb if (error)
555 1.2 simonb return error;
556 1.2 simonb
557 1.2 simonb blksize = DEV_BSIZE;
558 1.2 simonb logend = dkw.dkw_size;
559 1.2 simonb }
560 1.2 simonb
561 1.3 simonb if ((logend - logstart) * blksize >= desired_logsize) {
562 1.2 simonb KDASSERT(blksize != 0);
563 1.2 simonb DPRINTF("enough space, use end-of-partition log\n");
564 1.2 simonb
565 1.2 simonb *startp = logstart;
566 1.2 simonb *countp = (logend - logstart);
567 1.2 simonb *blksizep = blksize;
568 1.2 simonb *extradatap = 0;
569 1.2 simonb
570 1.2 simonb /* update superblock with log location */
571 1.2 simonb fs->fs_journal_version = UFS_WAPBL_VERSION;
572 1.2 simonb fs->fs_journal_location = UFS_WAPBL_JOURNALLOC_END_PARTITION;
573 1.2 simonb fs->fs_journal_flags = 0;
574 1.2 simonb fs->fs_journallocs[UFS_WAPBL_EPART_ADDR] = *startp;
575 1.2 simonb fs->fs_journallocs[UFS_WAPBL_EPART_COUNT] = *countp;
576 1.2 simonb fs->fs_journallocs[UFS_WAPBL_EPART_BLKSZ] = *blksizep;
577 1.2 simonb fs->fs_journallocs[UFS_WAPBL_EPART_UNUSED] = *extradatap;
578 1.2 simonb
579 1.2 simonb error = ffs_sbupdate(ump, MNT_WAIT);
580 1.2 simonb return error;
581 1.2 simonb }
582 1.2 simonb DPRINTF("end-of-partition has only %" PRId64 " free\n",
583 1.2 simonb logend - logstart);
584 1.2 simonb
585 1.2 simonb error = wapbl_create_infs_log(mp, fs, devvp, startp, countp, blksizep,
586 1.2 simonb extradatap);
587 1.2 simonb
588 1.10 yamt ffs_sync(mp, MNT_WAIT, FSCRED);
589 1.2 simonb
590 1.2 simonb return error;
591 1.2 simonb }
592 1.2 simonb
593 1.2 simonb /*
594 1.2 simonb * Try to create a journal log inside the filesystem.
595 1.2 simonb */
596 1.2 simonb static int
597 1.2 simonb wapbl_create_infs_log(struct mount *mp, struct fs *fs, struct vnode *devvp,
598 1.2 simonb daddr_t *startp, size_t *countp, size_t *blksizep, uint64_t *extradatap)
599 1.2 simonb {
600 1.2 simonb struct vnode *vp, *rvp;
601 1.2 simonb struct inode *ip;
602 1.2 simonb int error;
603 1.2 simonb
604 1.2 simonb if ((error = VFS_ROOT(mp, &rvp)) != 0)
605 1.2 simonb return error;
606 1.2 simonb
607 1.2 simonb if ((error = UFS_VALLOC(rvp, 0 | S_IFREG, NOCRED, &vp)) != 0) {
608 1.2 simonb vput(rvp);
609 1.2 simonb return error;
610 1.2 simonb }
611 1.2 simonb vput(rvp);
612 1.2 simonb
613 1.2 simonb vp->v_type = VREG;
614 1.2 simonb ip = VTOI(vp);
615 1.2 simonb ip->i_flag |= IN_ACCESS | IN_CHANGE | IN_UPDATE;
616 1.2 simonb ip->i_mode = 0 | IFREG;
617 1.2 simonb DIP_ASSIGN(ip, mode, ip->i_mode);
618 1.2 simonb ip->i_flags = SF_LOG;
619 1.2 simonb DIP_ASSIGN(ip, flags, ip->i_flags);
620 1.2 simonb ip->i_nlink = 1;
621 1.2 simonb DIP_ASSIGN(ip, nlink, 1);
622 1.2 simonb ffs_update(vp, NULL, NULL, UPDATE_WAIT);
623 1.2 simonb
624 1.2 simonb if ((error = wapbl_allocate_log_file(mp, vp)) != 0) {
625 1.2 simonb /*
626 1.2 simonb * If we couldn't allocate the space for the log file,
627 1.2 simonb * remove the inode by setting its link count back to
628 1.2 simonb * zero and bail.
629 1.2 simonb */
630 1.2 simonb ip->i_nlink = 0;
631 1.2 simonb DIP_ASSIGN(ip, nlink, 0);
632 1.2 simonb vput(vp);
633 1.2 simonb
634 1.2 simonb return error;
635 1.2 simonb }
636 1.2 simonb
637 1.2 simonb /*
638 1.2 simonb * Now that we have the place-holder inode for the journal,
639 1.2 simonb * we don't need the vnode ever again.
640 1.2 simonb */
641 1.2 simonb vput(vp);
642 1.2 simonb
643 1.2 simonb *startp = fs->fs_journallocs[UFS_WAPBL_INFS_ADDR];
644 1.2 simonb *countp = fs->fs_journallocs[UFS_WAPBL_INFS_COUNT];
645 1.2 simonb *blksizep = fs->fs_journallocs[UFS_WAPBL_INFS_BLKSZ];
646 1.2 simonb *extradatap = fs->fs_journallocs[UFS_WAPBL_INFS_INO];
647 1.2 simonb
648 1.2 simonb return 0;
649 1.2 simonb }
650 1.2 simonb
651 1.2 simonb int
652 1.2 simonb wapbl_allocate_log_file(struct mount *mp, struct vnode *vp)
653 1.2 simonb {
654 1.2 simonb struct ufsmount *ump = VFSTOUFS(mp);
655 1.2 simonb struct fs *fs = ump->um_fs;
656 1.2 simonb daddr_t addr, indir_addr;
657 1.2 simonb off_t logsize;
658 1.2 simonb size_t size;
659 1.2 simonb int error;
660 1.2 simonb
661 1.2 simonb logsize = 0;
662 1.2 simonb /* check if there's a suggested log size */
663 1.2 simonb if (fs->fs_journal_flags & UFS_WAPBL_FLAGS_CREATE_LOG &&
664 1.2 simonb fs->fs_journal_location == UFS_WAPBL_JOURNALLOC_IN_FILESYSTEM)
665 1.2 simonb logsize = fs->fs_journallocs[UFS_WAPBL_INFS_COUNT];
666 1.2 simonb
667 1.2 simonb if (vp->v_size > 0) {
668 1.2 simonb printf("%s: file size (%" PRId64 ") non zero\n", __func__,
669 1.2 simonb vp->v_size);
670 1.2 simonb return EEXIST;
671 1.2 simonb }
672 1.2 simonb wapbl_find_log_start(mp, vp, logsize, &addr, &indir_addr, &size);
673 1.2 simonb if (addr == 0) {
674 1.2 simonb printf("%s: log not allocated, largest extent is "
675 1.2 simonb "%" PRId64 "MB\n", __func__,
676 1.2 simonb lblktosize(fs, size) / (1024 * 1024));
677 1.2 simonb return ENOSPC;
678 1.2 simonb }
679 1.2 simonb
680 1.2 simonb logsize = lblktosize(fs, size); /* final log size */
681 1.2 simonb
682 1.2 simonb VTOI(vp)->i_ffs_first_data_blk = addr;
683 1.2 simonb VTOI(vp)->i_ffs_first_indir_blk = indir_addr;
684 1.2 simonb
685 1.2 simonb error = GOP_ALLOC(vp, 0, logsize, B_CONTIG, FSCRED);
686 1.2 simonb if (error) {
687 1.2 simonb printf("%s: GOP_ALLOC error %d\n", __func__, error);
688 1.2 simonb return error;
689 1.2 simonb }
690 1.2 simonb
691 1.2 simonb fs->fs_journal_version = UFS_WAPBL_VERSION;
692 1.2 simonb fs->fs_journal_location = UFS_WAPBL_JOURNALLOC_IN_FILESYSTEM;
693 1.2 simonb fs->fs_journal_flags = 0;
694 1.2 simonb fs->fs_journallocs[UFS_WAPBL_INFS_ADDR] =
695 1.2 simonb lfragtosize(fs, addr) / DEV_BSIZE;
696 1.2 simonb fs->fs_journallocs[UFS_WAPBL_INFS_COUNT] = logsize / DEV_BSIZE;
697 1.2 simonb fs->fs_journallocs[UFS_WAPBL_INFS_BLKSZ] = DEV_BSIZE;
698 1.2 simonb fs->fs_journallocs[UFS_WAPBL_INFS_INO] = VTOI(vp)->i_number;
699 1.2 simonb
700 1.2 simonb error = ffs_sbupdate(ump, MNT_WAIT);
701 1.2 simonb return error;
702 1.2 simonb }
703 1.2 simonb
704 1.2 simonb /*
705 1.2 simonb * Find a suitable location for the journal in the filesystem.
706 1.2 simonb *
707 1.2 simonb * Our strategy here is to look for a contiguous block of free space
708 1.2 simonb * at least "logfile" MB in size (plus room for any indirect blocks).
709 1.2 simonb * We start at the middle of the filesystem and check each cylinder
710 1.2 simonb * group working outwards. If "logfile" MB is not available as a
711 1.2 simonb * single contigous chunk, then return the address and size of the
712 1.2 simonb * largest chunk found.
713 1.2 simonb *
714 1.2 simonb * XXX
715 1.2 simonb * At what stage does the search fail? Is if the largest space we could
716 1.2 simonb * find is less than a quarter the requested space reasonable? If the
717 1.2 simonb * search fails entirely, return a block address if "0" it indicate this.
718 1.2 simonb */
719 1.2 simonb static void
720 1.2 simonb wapbl_find_log_start(struct mount *mp, struct vnode *vp, off_t logsize,
721 1.2 simonb daddr_t *addr, daddr_t *indir_addr, size_t *size)
722 1.2 simonb {
723 1.2 simonb struct ufsmount *ump = VFSTOUFS(mp);
724 1.2 simonb struct fs *fs = ump->um_fs;
725 1.2 simonb struct vnode *devvp = ump->um_devvp;
726 1.2 simonb struct cg *cgp;
727 1.2 simonb struct buf *bp;
728 1.2 simonb uint8_t *blksfree;
729 1.2 simonb daddr_t blkno, best_addr, start_addr;
730 1.2 simonb daddr_t desired_blks, min_desired_blks;
731 1.2 simonb daddr_t freeblks, best_blks;
732 1.2 simonb int bpcg, cg, error, fixedsize, indir_blks, n, s;
733 1.2 simonb #ifdef FFS_EI
734 1.2 simonb const int needswap = UFS_FSNEEDSWAP(fs);
735 1.2 simonb #endif
736 1.2 simonb
737 1.2 simonb if (logsize == 0) {
738 1.2 simonb fixedsize = 0; /* We can adjust the size if tight */
739 1.2 simonb logsize = lfragtosize(fs, fs->fs_dsize) /
740 1.2 simonb UFS_WAPBL_JOURNAL_SCALE;
741 1.2 simonb DPRINTF("suggested log size = %" PRId64 "\n", logsize);
742 1.2 simonb logsize = max(logsize, UFS_WAPBL_MIN_JOURNAL_SIZE);
743 1.2 simonb logsize = min(logsize, UFS_WAPBL_MAX_JOURNAL_SIZE);
744 1.2 simonb DPRINTF("adjusted log size = %" PRId64 "\n", logsize);
745 1.2 simonb } else {
746 1.2 simonb fixedsize = 1;
747 1.2 simonb DPRINTF("fixed log size = %" PRId64 "\n", logsize);
748 1.2 simonb }
749 1.2 simonb
750 1.2 simonb desired_blks = logsize / fs->fs_bsize;
751 1.2 simonb DPRINTF("desired blocks = %" PRId64 "\n", desired_blks);
752 1.2 simonb
753 1.2 simonb /* add in number of indirect blocks needed */
754 1.2 simonb indir_blks = 0;
755 1.2 simonb if (desired_blks >= NDADDR) {
756 1.2 simonb struct indir indirs[NIADDR + 2];
757 1.2 simonb int num;
758 1.2 simonb
759 1.2 simonb error = ufs_getlbns(vp, desired_blks, indirs, &num);
760 1.2 simonb if (error) {
761 1.2 simonb printf("%s: ufs_getlbns failed, error %d!\n",
762 1.2 simonb __func__, error);
763 1.2 simonb goto bad;
764 1.2 simonb }
765 1.2 simonb
766 1.2 simonb switch (num) {
767 1.2 simonb case 2:
768 1.2 simonb indir_blks = 1; /* 1st level indirect */
769 1.2 simonb break;
770 1.2 simonb case 3:
771 1.2 simonb indir_blks = 1 + /* 1st level indirect */
772 1.2 simonb 1 + /* 2nd level indirect */
773 1.2 simonb indirs[1].in_off + 1; /* extra 1st level indirect */
774 1.2 simonb break;
775 1.2 simonb default:
776 1.2 simonb printf("%s: unexpected numlevels %d from ufs_getlbns\n",
777 1.2 simonb __func__, num);
778 1.2 simonb *size = 0;
779 1.2 simonb goto bad;
780 1.2 simonb }
781 1.2 simonb desired_blks += indir_blks;
782 1.2 simonb }
783 1.2 simonb DPRINTF("desired blocks = %" PRId64 " (including indirect)\n",
784 1.2 simonb desired_blks);
785 1.2 simonb
786 1.2 simonb /*
787 1.2 simonb * If a specific size wasn't requested, allow for a smaller log
788 1.2 simonb * if we're really tight for space...
789 1.2 simonb */
790 1.2 simonb min_desired_blks = desired_blks;
791 1.2 simonb if (!fixedsize)
792 1.2 simonb min_desired_blks = desired_blks / 4;
793 1.2 simonb
794 1.2 simonb /* Look at number of blocks per CG. If it's too small, bail early. */
795 1.2 simonb bpcg = fragstoblks(fs, fs->fs_fpg);
796 1.2 simonb if (min_desired_blks > bpcg) {
797 1.2 simonb printf("ffs_wapbl: cylinder group size of %" PRId64 " MB "
798 1.2 simonb " is not big enough for journal\n",
799 1.2 simonb lblktosize(fs, bpcg) / (1024 * 1024));
800 1.2 simonb goto bad;
801 1.2 simonb }
802 1.2 simonb
803 1.2 simonb /*
804 1.2 simonb * Start with the middle cylinder group, and search outwards in
805 1.2 simonb * both directions until we either find the requested log size
806 1.2 simonb * or reach the start/end of the file system. If we reach the
807 1.2 simonb * start/end without finding enough space for the full requested
808 1.2 simonb * log size, use the largest extent found if it is large enough
809 1.2 simonb * to satisfy the our minimum size.
810 1.2 simonb *
811 1.2 simonb * XXX
812 1.2 simonb * Can we just use the cluster contigsum stuff (esp on UFS2)
813 1.2 simonb * here to simplify this search code?
814 1.2 simonb */
815 1.2 simonb best_addr = 0;
816 1.2 simonb best_blks = 0;
817 1.2 simonb for (cg = fs->fs_ncg / 2, s = 0, n = 1;
818 1.2 simonb best_blks < desired_blks && cg >= 0 && cg < fs->fs_ncg;
819 1.2 simonb s++, n = -n, cg += n * s) {
820 1.2 simonb DPRINTF("check cg %d of %d\n", cg, fs->fs_ncg);
821 1.2 simonb error = bread(devvp, fsbtodb(fs, cgtod(fs, cg)),
822 1.2 simonb fs->fs_cgsize, FSCRED, 0, &bp);
823 1.2 simonb cgp = (struct cg *)bp->b_data;
824 1.2 simonb if (error || !cg_chkmagic(cgp, UFS_FSNEEDSWAP(fs))) {
825 1.2 simonb brelse(bp, 0);
826 1.2 simonb continue;
827 1.2 simonb }
828 1.2 simonb
829 1.2 simonb blksfree = cg_blksfree(cgp, needswap);
830 1.2 simonb
831 1.2 simonb for (blkno = 0; blkno < bpcg;) {
832 1.2 simonb /* look for next free block */
833 1.2 simonb /* XXX use scanc() and fragtbl[] here? */
834 1.2 simonb for (; blkno < bpcg - min_desired_blks; blkno++)
835 1.2 simonb if (ffs_isblock(fs, blksfree, blkno))
836 1.2 simonb break;
837 1.2 simonb
838 1.2 simonb /* past end of search space in this CG? */
839 1.2 simonb if (blkno >= bpcg - min_desired_blks)
840 1.2 simonb break;
841 1.2 simonb
842 1.2 simonb /* count how many free blocks in this extent */
843 1.2 simonb start_addr = blkno;
844 1.2 simonb for (freeblks = 0; blkno < bpcg; blkno++, freeblks++)
845 1.2 simonb if (!ffs_isblock(fs, blksfree, blkno))
846 1.2 simonb break;
847 1.2 simonb
848 1.2 simonb if (freeblks > best_blks) {
849 1.2 simonb best_blks = freeblks;
850 1.2 simonb best_addr = blkstofrags(fs, start_addr) +
851 1.2 simonb cgbase(fs, cg);
852 1.2 simonb
853 1.2 simonb if (freeblks >= desired_blks) {
854 1.2 simonb DPRINTF("found len %" PRId64
855 1.2 simonb " at offset %" PRId64 " in gc\n",
856 1.2 simonb freeblks, start_addr);
857 1.2 simonb break;
858 1.2 simonb }
859 1.2 simonb }
860 1.2 simonb }
861 1.2 simonb brelse(bp, 0);
862 1.2 simonb }
863 1.2 simonb DPRINTF("best found len = %" PRId64 ", wanted %" PRId64
864 1.2 simonb " at addr %" PRId64 "\n", best_blks, desired_blks, best_addr);
865 1.2 simonb
866 1.2 simonb if (best_blks < min_desired_blks) {
867 1.2 simonb *addr = 0;
868 1.2 simonb *indir_addr = 0;
869 1.2 simonb } else {
870 1.2 simonb /* put indirect blocks at start, and data blocks after */
871 1.2 simonb *addr = best_addr + blkstofrags(fs, indir_blks);
872 1.2 simonb *indir_addr = best_addr;
873 1.2 simonb }
874 1.2 simonb *size = min(desired_blks, best_blks) - indir_blks;
875 1.2 simonb return;
876 1.2 simonb
877 1.2 simonb bad:
878 1.2 simonb *addr = 0;
879 1.2 simonb *indir_addr = 0;
880 1.2 simonb *size = 0;
881 1.2 simonb return;
882 1.2 simonb }
883