Merge commit 'refs/top-bases/linux-zpios' into linux-zpios

This commit is contained in:
Brian Behlendorf 2008-12-17 12:17:21 -08:00
commit 3ee8ce5cd9
1 changed files with 2 additions and 2 deletions

View File

@ -334,8 +334,8 @@ typedef void zil_parse_blk_func_t(zilog_t *zilog, blkptr_t *bp, void *arg,
uint64_t txg); uint64_t txg);
typedef void zil_parse_lr_func_t(zilog_t *zilog, lr_t *lr, void *arg, typedef void zil_parse_lr_func_t(zilog_t *zilog, lr_t *lr, void *arg,
uint64_t txg); uint64_t txg);
typedef int zil_replay_func_t(); typedef int zil_replay_func_t(void);
typedef void zil_replay_cleaner_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); 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, extern uint64_t zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func,