summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/zfs/zil.c
diff options
context:
space:
mode:
authorahrens <none@none>2006-06-14 23:16:39 -0700
committerahrens <none@none>2006-06-14 23:16:39 -0700
commit1d452cf5123cb6ac0a013a4dbd4dcceeb0da314d (patch)
tree4c6acabeb0476b9d46ef194f560e953da44094b0 /usr/src/uts/common/fs/zfs/zil.c
parent7a0b67e3ef0ce92ca436e68c45383a76e14311a0 (diff)
downloadillumos-joyent-1d452cf5123cb6ac0a013a4dbd4dcceeb0da314d.tar.gz
PSARC 2006/388 snapshot -r
6373978 want to take lots of snapshots quickly ('zfs snapshot -r')
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zil.c')
-rw-r--r--usr/src/uts/common/fs/zfs/zil.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/zil.c b/usr/src/uts/common/fs/zfs/zil.c
index 8ee194d5f9..7441d3271f 100644
--- a/usr/src/uts/common/fs/zfs/zil.c
+++ b/usr/src/uts/common/fs/zfs/zil.c
@@ -448,7 +448,7 @@ zil_destroy(zilog_t *zilog, boolean_t keep_first)
ASSERT(BP_IS_HOLE(&zh->zh_log));
}
-void
+int
zil_claim(char *osname, void *txarg)
{
dmu_tx_t *tx = txarg;
@@ -461,7 +461,7 @@ zil_claim(char *osname, void *txarg)
error = dmu_objset_open(osname, DMU_OST_ANY, DS_MODE_STANDARD, &os);
if (error) {
cmn_err(CE_WARN, "can't process intent log for %s", osname);
- return;
+ return (0);
}
zilog = dmu_objset_zil(os);
@@ -484,6 +484,7 @@ zil_claim(char *osname, void *txarg)
ASSERT3U(first_txg, ==, (spa_last_synced_txg(zilog->zl_spa) + 1));
dmu_objset_close(os);
+ return (0);
}
void