From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 15 Jan 2009 22:05:21 +0000 (-0800)
Subject: Resolve conflict with removed cleaner type
X-Git-Tag: zfs-0.4.4~12^2~84^2~2^2^2~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86e39f5e3b69ef01015549d8f4ab932ef392e07e;p=zfs

Resolve conflict with removed cleaner type
---

86e39f5e3b69ef01015549d8f4ab932ef392e07e
diff --cc module/zfs/include/sys/zil.h
index 402a16cb2,b69323cfa..6a0f101d1
--- a/module/zfs/include/sys/zil.h
+++ b/module/zfs/include/sys/zil.h
@@@ -334,8 -334,7 +334,7 @@@ typedef void zil_parse_blk_func_t(zilog
      uint64_t txg);
  typedef void zil_parse_lr_func_t(zilog_t *zilog, lr_t *lr, void *arg,
      uint64_t txg);
 -typedef int zil_replay_func_t();
 +typedef int zil_replay_func_t(void *, char *, boolean_t);
- typedef void zil_replay_cleaner_t(void *);
  typedef int zil_get_data_t(void *arg, lr_write_t *lr, char *dbuf, zio_t *zio);
  
  extern uint64_t	zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func,