From f7295e4683a843ac4cc014d634e3b89c682181a9 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 13 Jan 2009 13:47:51 -0800 Subject: [PATCH 1/7] New TopGit dependency: fix-list --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 6473788b04..185f3d2cc3 100644 --- a/.topdeps +++ b/.topdeps @@ -11,3 +11,4 @@ fix-pthreads fix-rwlocks fix-stack fix-taskq +fix-list From eea2f939cb5074d20369af20779803579604f93a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 13 Jan 2009 14:06:30 -0800 Subject: [PATCH 2/7] Remove fix-list --- .topdeps | 1 - 1 file changed, 1 deletion(-) diff --git a/.topdeps b/.topdeps index 185f3d2cc3..6473788b04 100644 --- a/.topdeps +++ b/.topdeps @@ -11,4 +11,3 @@ fix-pthreads fix-rwlocks fix-stack fix-taskq -fix-list From c4f7d991f626e2aea729134a0fe65d11394ceee0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 13 Jan 2009 14:08:14 -0800 Subject: [PATCH 3/7] New TopGit dependency: fix-list --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 6473788b04..185f3d2cc3 100644 --- a/.topdeps +++ b/.topdeps @@ -11,3 +11,4 @@ fix-pthreads fix-rwlocks fix-stack fix-taskq +fix-list From 20bc74fccf720a98a26c5100b7c703a43dd7782e Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 13 Jan 2009 14:11:50 -0800 Subject: [PATCH 4/7] Remove dependency --- .topdeps | 1 - 1 file changed, 1 deletion(-) diff --git a/.topdeps b/.topdeps index 185f3d2cc3..6473788b04 100644 --- a/.topdeps +++ b/.topdeps @@ -11,4 +11,3 @@ fix-pthreads fix-rwlocks fix-stack fix-taskq -fix-list From 877f0350973b86cc6b8a09abc80c450e36918bcf Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 13 Jan 2009 14:14:11 -0800 Subject: [PATCH 5/7] Add topmsg --- .topdeps | 1 + .topmsg | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 .topdeps create mode 100644 .topmsg diff --git a/.topdeps b/.topdeps new file mode 100644 index 0000000000..1f7391f92b --- /dev/null +++ b/.topdeps @@ -0,0 +1 @@ +master diff --git a/.topmsg b/.topmsg new file mode 100644 index 0000000000..9fa80353b8 --- /dev/null +++ b/.topmsg @@ -0,0 +1,8 @@ +From: Brian Behlendorf +Subject: [PATCH] fix-list + +Remove all instances of list handling where the API is not used +and instead list data members are directly accessed. Doing this +sort of thing is bad for portability. + +Signed-off-by: Brian Behlendorf From c638d63e0e42f804efec65c061c4f5882047594c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 13 Jan 2009 14:14:20 -0800 Subject: [PATCH 6/7] New TopGit dependency: fix-list --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 6473788b04..185f3d2cc3 100644 --- a/.topdeps +++ b/.topdeps @@ -11,3 +11,4 @@ fix-pthreads fix-rwlocks fix-stack fix-taskq +fix-list From 2ea04834bfb7ca82cff5908f0932056c7825d759 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 13 Jan 2009 14:16:11 -0800 Subject: [PATCH 7/7] Remove assertion for now --- module/zfs/zil.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/module/zfs/zil.c b/module/zfs/zil.c index 95101882ba..e97f0bec88 100644 --- a/module/zfs/zil.c +++ b/module/zfs/zil.c @@ -488,9 +488,14 @@ zil_rollback_destroy(zilog_t *zilog, dmu_tx_t *tx) /* * Ensure there's no outstanding ZIL IO. No lwbs or just the * unused one that allocated in advance is ok. + * + * XXX: The assertion is correct, but we need a portable version + * which does not rely on directly accessing the list nodes. */ +#if 0 ASSERT(zilog->zl_lwb_list.list_head.list_next == zilog->zl_lwb_list.list_head.list_prev); +#endif (void) zil_parse(zilog, zil_free_log_block, zil_free_log_record, tx, zh->zh_claim_txg); }