Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In wapbl_replay_write just iterate over the hash table and not the

Browse Source 
transactions. The initial prescan has already sorted out what blocks are
in the journal and removed any revoced blocks, so the hash table is
authorative.
This commit is contained in:
joerg 2008-11-17 22:08:09 +00:00
parent 5a45b84ca9
commit c42112239b
1 changed files with 20 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
sys/kern/vfs_wapbl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_wapbl.c,v 1.8 2008/11/17 19:36:11 joerg Exp $ */ /* $NetBSD: vfs_wapbl.c,v 1.9 2008/11/17 22:08:09 joerg Exp $ */
/*- /*-
* Copyright (c) 2003,2008 The NetBSD Foundation, Inc. * Copyright (c) 2003,2008 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
#define WAPBL_INTERNAL #define WAPBL_INTERNAL
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.8 2008/11/17 19:36:11 joerg Exp $"); __KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.9 2008/11/17 22:08:09 joerg Exp $");
#include <sys/param.h> #include <sys/param.h>
@ -2711,81 +2711,32 @@ wapbl_replay_verify(struct wapbl_replay *wr, struct vnode *fsdevvp)
int int
wapbl_replay_write(struct wapbl_replay *wr, struct vnode *fsdevvp) wapbl_replay_write(struct wapbl_replay *wr, struct vnode *fsdevvp)
{ {
off_t off;
struct wapbl_wc_header *wch = &wr->wr_wc_header; struct wapbl_wc_header *wch = &wr->wr_wc_header;
int logblklen = 1<<wch->wc_log_dev_bshift; struct wapbl_blk *wb;
int fsblklen = 1<<wch->wc_fs_dev_bshift; size_t i;
void *scratch1 = wapbl_malloc(MAXBSIZE); off_t off;
void *scratch;
int error = 0; int error = 0;
int fsblklen = 1 << wch->wc_fs_dev_bshift;
KDASSERT(wapbl_replay_isopen(wr)); KDASSERT(wapbl_replay_isopen(wr));
/* scratch = wapbl_malloc(MAXBSIZE);
* This parses the journal for replay, although it could
* just as easily walk the hashtable instead.
*/
off = wch->wc_tail; for (i = 0; i < wr->wr_blkhashmask; ++i) {
while (off != wch->wc_head) { LIST_FOREACH(wb, &wr->wr_blkhash[i], wb_hash) {
struct wapbl_wc_null *wcn; off = wb->wb_off;
#ifdef DEBUG error = wapbl_circ_read(wr, scratch, fsblklen, &off);
off_t saveoff = off; if (error)
#endif break;
error = wapbl_circ_read(wr, wr->wr_scratch, logblklen, &off); error = wapbl_write(scratch, fsblklen, fsdevvp,
if (error) wb->wb_blk);
goto out; if (error)
wcn = (struct wapbl_wc_null *)wr->wr_scratch; break;
switch (wcn->wc_type) {
case WAPBL_WC_BLOCKS:
{
struct wapbl_wc_blocklist *wc =
(struct wapbl_wc_blocklist *)wr->wr_scratch;
int i;
for (i = 0; i < wc->wc_blkcount; i++) {
int j, n;
/*
* Check each physical block against
* the hashtable independently
*/
n = wc->wc_blocks[i].wc_dlen >>
wch->wc_fs_dev_bshift;
for (j = 0; j < n; j++) {
struct wapbl_blk *wb =
wapbl_blkhash_get(wr,
wc->wc_blocks[i].wc_daddr + j);
if (wb && (wb->wb_off == off)) {
error = wapbl_circ_read(
wr, scratch1,
fsblklen, &off);
if (error)
goto out;
error =
wapbl_write(scratch1,
fsblklen, fsdevvp,
wb->wb_blk);
if (error)
goto out;
} else {
wapbl_circ_advance(wr,
fsblklen, &off);
}
}
}
}
break;
case WAPBL_WC_REVOCATIONS:
case WAPBL_WC_INODES:
break;
default:
KASSERT(0);
} }
#ifdef DEBUG
wapbl_circ_advance(wr, wcn->wc_len, &saveoff);
KASSERT(off == saveoff);
#endif
} }
out:
wapbl_free(scratch1); wapbl_free(scratch);
return error; return error;
} }