Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

zil_parse: make callback parameters const 

Code cleanup, a follow up commit to 4d55ea81.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Co-authored-by: Ryan Moeller <ryan@freqlabs.com>
Signed-off-by: Christian Schwarz <me@cschwarz.com>
Closes #11020
This commit is contained in:
Christian Schwarz 2020-10-09 18:34:54 +02:00 committed by Brian Behlendorf
parent 5e7198b873
commit 5c6d3c21b1
5 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cmd/zdb/zdb_il.c
View File

@ -62,9 +62,9 @@ print_log_bp(const blkptr_t *bp, const char *prefix)
/* ARGSUSED */ /* ARGSUSED */
static void static void
zil_prt_rec_create(zilog_t *zilog, int txtype, void *arg) zil_prt_rec_create(zilog_t *zilog, int txtype, const void *arg)
{ {
lr_create_t *lr = arg; const lr_create_t *lr = arg;
time_t crtime = lr->lr_crtime[0]; time_t crtime = lr->lr_crtime[0];
char *name, *link; char *name, *link;
lr_attr_t *lrattr; lr_attr_t *lrattr;
@ -98,9 +98,9 @@ zil_prt_rec_create(zilog_t *zilog, int txtype, void *arg)
/* ARGSUSED */ /* ARGSUSED */
static void static void
zil_prt_rec_remove(zilog_t *zilog, int txtype, void *arg) zil_prt_rec_remove(zilog_t *zilog, int txtype, const void *arg)
{ {
lr_remove_t *lr = arg; const lr_remove_t *lr = arg;
(void) printf("%sdoid %llu, name %s\n", tab_prefix, (void) printf("%sdoid %llu, name %s\n", tab_prefix,
(u_longlong_t)lr->lr_doid, (char *)(lr + 1)); (u_longlong_t)lr->lr_doid, (char *)(lr + 1));
@ -108,9 +108,9 @@ zil_prt_rec_remove(zilog_t *zilog, int txtype, void *arg)
/* ARGSUSED */ /* ARGSUSED */
static void static void
zil_prt_rec_link(zilog_t *zilog, int txtype, void *arg) zil_prt_rec_link(zilog_t *zilog, int txtype, const void *arg)
{ {
lr_link_t *lr = arg; const lr_link_t *lr = arg;
(void) printf("%sdoid %llu, link_obj %llu, name %s\n", tab_prefix, (void) printf("%sdoid %llu, link_obj %llu, name %s\n", tab_prefix,
(u_longlong_t)lr->lr_doid, (u_longlong_t)lr->lr_link_obj, (u_longlong_t)lr->lr_doid, (u_longlong_t)lr->lr_link_obj,
@ -119,9 +119,9 @@ zil_prt_rec_link(zilog_t *zilog, int txtype, void *arg)
/* ARGSUSED */ /* ARGSUSED */
static void static void
zil_prt_rec_rename(zilog_t *zilog, int txtype, void *arg) zil_prt_rec_rename(zilog_t *zilog, int txtype, const void *arg)
{ {
lr_rename_t *lr = arg; const lr_rename_t *lr = arg;
char *snm = (char *)(lr + 1); char *snm = (char *)(lr + 1);
char *tnm = snm + strlen(snm) + 1; char *tnm = snm + strlen(snm) + 1;
@ -148,11 +148,11 @@ zil_prt_rec_write_cb(void *data, size_t len, void *unused)
/* ARGSUSED */ /* ARGSUSED */
static void static void
zil_prt_rec_write(zilog_t *zilog, int txtype, void *arg) zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
{ {
lr_write_t *lr = arg; const lr_write_t *lr = arg;
abd_t *data; abd_t *data;
blkptr_t *bp = &lr->lr_blkptr; const blkptr_t *bp = &lr->lr_blkptr;
zbookmark_phys_t zb; zbookmark_phys_t zb;
int verbose = MAX(dump_opt['d'], dump_opt['i']); int verbose = MAX(dump_opt['d'], dump_opt['i']);
int error; int error;
@ -211,9 +211,9 @@ out:
/* ARGSUSED */ /* ARGSUSED */
static void static void
zil_prt_rec_truncate(zilog_t *zilog, int txtype, void *arg) zil_prt_rec_truncate(zilog_t *zilog, int txtype, const void *arg)
{ {
lr_truncate_t *lr = arg; const lr_truncate_t *lr = arg;
(void) printf("%sfoid %llu, offset 0x%llx, length 0x%llx\n", tab_prefix, (void) printf("%sfoid %llu, offset 0x%llx, length 0x%llx\n", tab_prefix,
(u_longlong_t)lr->lr_foid, (longlong_t)lr->lr_offset, (u_longlong_t)lr->lr_foid, (longlong_t)lr->lr_offset,
@ -222,9 +222,9 @@ zil_prt_rec_truncate(zilog_t *zilog, int txtype, void *arg)
/* ARGSUSED */ /* ARGSUSED */
static void static void
zil_prt_rec_setattr(zilog_t *zilog, int txtype, void *arg) zil_prt_rec_setattr(zilog_t *zilog, int txtype, const void *arg)
{ {
lr_setattr_t *lr = arg; const lr_setattr_t *lr = arg;
time_t atime = (time_t)lr->lr_atime[0]; time_t atime = (time_t)lr->lr_atime[0];
time_t mtime = (time_t)lr->lr_mtime[0]; time_t mtime = (time_t)lr->lr_mtime[0];
@ -268,15 +268,15 @@ zil_prt_rec_setattr(zilog_t *zilog, int txtype, void *arg)
/* ARGSUSED */ /* ARGSUSED */
static void static void
zil_prt_rec_acl(zilog_t *zilog, int txtype, void *arg) zil_prt_rec_acl(zilog_t *zilog, int txtype, const void *arg)
{ {
lr_acl_t *lr = arg; const lr_acl_t *lr = arg;
(void) printf("%sfoid %llu, aclcnt %llu\n", tab_prefix, (void) printf("%sfoid %llu, aclcnt %llu\n", tab_prefix,
(u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt); (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt);
} }
typedef void (*zil_prt_rec_func_t)(zilog_t *, int, void *); typedef void (*zil_prt_rec_func_t)(zilog_t *, int, const void *);
typedef struct zil_rec_info { typedef struct zil_rec_info {
zil_prt_rec_func_t zri_print; zil_prt_rec_func_t zri_print;
const char *zri_name; const char *zri_name;
@ -309,7 +309,7 @@ static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
/* ARGSUSED */ /* ARGSUSED */
static int static int
print_log_record(zilog_t *zilog, lr_t *lr, void *arg, uint64_t claim_txg) print_log_record(zilog_t *zilog, const lr_t *lr, void *arg, uint64_t claim_txg)
{ {
int txtype; int txtype;
int verbose = MAX(dump_opt['d'], dump_opt['i']); int verbose = MAX(dump_opt['d'], dump_opt['i']);
@ -343,7 +343,8 @@ print_log_record(zilog_t *zilog, lr_t *lr, void *arg, uint64_t claim_txg)
/* ARGSUSED */ /* ARGSUSED */
static int static int
print_log_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg) print_log_block(zilog_t *zilog, const blkptr_t *bp, void *arg,
uint64_t claim_txg)
{ {
char blkbuf[BP_SPRINTF_LEN + 10]; char blkbuf[BP_SPRINTF_LEN + 10];
int verbose = MAX(dump_opt['d'], dump_opt['i']); int verbose = MAX(dump_opt['d'], dump_opt['i']);

4
include/sys/zil.h
View File

@ -462,9 +462,9 @@ extern zil_stats_t zil_stats;
#define ZIL_STAT_BUMP(stat) \ #define ZIL_STAT_BUMP(stat) \
ZIL_STAT_INCR(stat, 1); ZIL_STAT_INCR(stat, 1);
typedef int zil_parse_blk_func_t(zilog_t *zilog, blkptr_t *bp, void *arg, typedef int zil_parse_blk_func_t(zilog_t *zilog, const blkptr_t *bp, void *arg,
uint64_t txg); uint64_t txg);
typedef int zil_parse_lr_func_t(zilog_t *zilog, lr_t *lr, void *arg, typedef int zil_parse_lr_func_t(zilog_t *zilog, const lr_t *lr, void *arg,
uint64_t txg); uint64_t txg);
typedef int zil_replay_func_t(void *arg1, void *arg2, boolean_t byteswap); typedef int zil_replay_func_t(void *arg1, void *arg2, boolean_t byteswap);
typedef int zil_get_data_t(void *arg, lr_write_t *lr, char *dbuf, typedef int zil_get_data_t(void *arg, lr_write_t *lr, char *dbuf,

6
module/zfs/dmu_traverse.c
View File

@ -73,7 +73,8 @@ static void prefetch_dnode_metadata(traverse_data_t *td, const dnode_phys_t *,
uint64_t objset, uint64_t object); uint64_t objset, uint64_t object);
static int static int
traverse_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg) traverse_zil_block(zilog_t *zilog, const blkptr_t *bp, void *arg,
uint64_t claim_txg)
{ {
traverse_data_t *td = arg; traverse_data_t *td = arg;
zbookmark_phys_t zb; zbookmark_phys_t zb;
@ -93,7 +94,8 @@ traverse_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
} }
static int static int
traverse_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg) traverse_zil_record(zilog_t *zilog, const lr_t *lrc, void *arg,
uint64_t claim_txg)
{ {
traverse_data_t *td = arg; traverse_data_t *td = arg;

10
module/zfs/dsl_scan.c
View File

@ -1375,7 +1375,8 @@ typedef struct zil_scan_arg {
/* ARGSUSED */ /* ARGSUSED */
static int static int
dsl_scan_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg) dsl_scan_zil_block(zilog_t *zilog, const blkptr_t *bp, void *arg,
uint64_t claim_txg)
{ {
zil_scan_arg_t *zsa = arg; zil_scan_arg_t *zsa = arg;
dsl_pool_t *dp = zsa->zsa_dp; dsl_pool_t *dp = zsa->zsa_dp;
@ -1405,15 +1406,16 @@ dsl_scan_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
/* ARGSUSED */ /* ARGSUSED */
static int static int
dsl_scan_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg) dsl_scan_zil_record(zilog_t *zilog, const lr_t *lrc, void *arg,
uint64_t claim_txg)
{ {
if (lrc->lrc_txtype == TX_WRITE) { if (lrc->lrc_txtype == TX_WRITE) {
zil_scan_arg_t *zsa = arg; zil_scan_arg_t *zsa = arg;
dsl_pool_t *dp = zsa->zsa_dp; dsl_pool_t *dp = zsa->zsa_dp;
dsl_scan_t *scn = dp->dp_scan; dsl_scan_t *scn = dp->dp_scan;
zil_header_t *zh = zsa->zsa_zh; zil_header_t *zh = zsa->zsa_zh;
lr_write_t *lr = (lr_write_t *)lrc; const lr_write_t *lr = (const lr_write_t *)lrc;
blkptr_t *bp = &lr->lr_blkptr; const blkptr_t *bp = &lr->lr_blkptr;
zbookmark_phys_t zb; zbookmark_phys_t zb;
ASSERT(!BP_IS_REDACTED(bp)); ASSERT(!BP_IS_REDACTED(bp));

25
module/zfs/zil.c
View File

@ -432,7 +432,8 @@ done:
/* ARGSUSED */ /* ARGSUSED */
static int static int
zil_clear_log_block(zilog_t *zilog, blkptr_t *bp, void *tx, uint64_t first_txg) zil_clear_log_block(zilog_t *zilog, const blkptr_t *bp, void *tx,
uint64_t first_txg)
{ {
ASSERT(!BP_IS_HOLE(bp)); ASSERT(!BP_IS_HOLE(bp));
@ -454,13 +455,15 @@ zil_clear_log_block(zilog_t *zilog, blkptr_t *bp, void *tx, uint64_t first_txg)
/* ARGSUSED */ /* ARGSUSED */
static int static int
zil_noop_log_record(zilog_t *zilog, lr_t *lrc, void *tx, uint64_t first_txg) zil_noop_log_record(zilog_t *zilog, const lr_t *lrc, void *tx,
uint64_t first_txg)
{ {
return (0); return (0);
} }
static int static int
zil_claim_log_block(zilog_t *zilog, blkptr_t *bp, void *tx, uint64_t first_txg) zil_claim_log_block(zilog_t *zilog, const blkptr_t *bp, void *tx,
uint64_t first_txg)
{ {
/* /*
* Claim log block if not already committed and not already claimed. * Claim log block if not already committed and not already claimed.
@ -476,7 +479,8 @@ zil_claim_log_block(zilog_t *zilog, blkptr_t *bp, void *tx, uint64_t first_txg)
} }
static int static int
zil_claim_log_record(zilog_t *zilog, lr_t *lrc, void *tx, uint64_t first_txg) zil_claim_log_record(zilog_t *zilog, const lr_t *lrc, void *tx,
uint64_t first_txg)
{ {
lr_write_t *lr = (lr_write_t *)lrc; lr_write_t *lr = (lr_write_t *)lrc;
int error; int error;
@ -503,7 +507,8 @@ zil_claim_log_record(zilog_t *zilog, lr_t *lrc, void *tx, uint64_t first_txg)
/* ARGSUSED */ /* ARGSUSED */
static int static int
zil_free_log_block(zilog_t *zilog, blkptr_t *bp, void *tx, uint64_t claim_txg) zil_free_log_block(zilog_t *zilog, const blkptr_t *bp, void *tx,
uint64_t claim_txg)
{ {
zio_free(zilog->zl_spa, dmu_tx_get_txg(tx), bp); zio_free(zilog->zl_spa, dmu_tx_get_txg(tx), bp);
@ -511,7 +516,8 @@ zil_free_log_block(zilog_t *zilog, blkptr_t *bp, void *tx, uint64_t claim_txg)
} }
static int static int
zil_free_log_record(zilog_t *zilog, lr_t *lrc, void *tx, uint64_t claim_txg) zil_free_log_record(zilog_t *zilog, const lr_t *lrc, void *tx,
uint64_t claim_txg)
{ {
lr_write_t *lr = (lr_write_t *)lrc; lr_write_t *lr = (lr_write_t *)lrc;
blkptr_t *bp = &lr->lr_blkptr; blkptr_t *bp = &lr->lr_blkptr;
@ -3471,7 +3477,7 @@ typedef struct zil_replay_arg {
} zil_replay_arg_t; } zil_replay_arg_t;
static int static int
zil_replay_error(zilog_t *zilog, lr_t *lr, int error) zil_replay_error(zilog_t *zilog, const lr_t *lr, int error)
{ {
char name[ZFS_MAX_DATASET_NAME_LEN]; char name[ZFS_MAX_DATASET_NAME_LEN];
@ -3489,7 +3495,8 @@ zil_replay_error(zilog_t *zilog, lr_t *lr, int error)
} }
static int static int
zil_replay_log_record(zilog_t *zilog, lr_t *lr, void *zra, uint64_t claim_txg) zil_replay_log_record(zilog_t *zilog, const lr_t *lr, void *zra,
uint64_t claim_txg)
{ {
zil_replay_arg_t *zr = zra; zil_replay_arg_t *zr = zra;
const zil_header_t *zh = zilog->zl_header; const zil_header_t *zh = zilog->zl_header;
@ -3572,7 +3579,7 @@ zil_replay_log_record(zilog_t *zilog, lr_t *lr, void *zra, uint64_t claim_txg)
/* ARGSUSED */ /* ARGSUSED */
static int static int
zil_incr_blks(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg) zil_incr_blks(zilog_t *zilog, const blkptr_t *bp, void *arg, uint64_t claim_txg)
{ {
zilog->zl_replay_blks++; zilog->zl_replay_blks++;