ubifs: Pass struct ubifs_info to ubifs_assert()
This allows us to have more context in ubifs_assert() and take different actions depending on the configuration. Signed-off-by: Richard Weinberger <richard@nod.at>
Este cometimento está contido em:
@@ -273,6 +273,7 @@ static int apply_replay_entry(struct ubifs_info *c, struct replay_entry *r)
|
||||
static int replay_entries_cmp(void *priv, struct list_head *a,
|
||||
struct list_head *b)
|
||||
{
|
||||
struct ubifs_info *c = priv;
|
||||
struct replay_entry *ra, *rb;
|
||||
|
||||
cond_resched();
|
||||
@@ -281,7 +282,7 @@ static int replay_entries_cmp(void *priv, struct list_head *a,
|
||||
|
||||
ra = list_entry(a, struct replay_entry, list);
|
||||
rb = list_entry(b, struct replay_entry, list);
|
||||
ubifs_assert(ra->sqnum != rb->sqnum);
|
||||
ubifs_assert(c, ra->sqnum != rb->sqnum);
|
||||
if (ra->sqnum > rb->sqnum)
|
||||
return 1;
|
||||
return -1;
|
||||
@@ -668,9 +669,9 @@ static int replay_bud(struct ubifs_info *c, struct bud_entry *b)
|
||||
goto out;
|
||||
}
|
||||
|
||||
ubifs_assert(ubifs_search_bud(c, lnum));
|
||||
ubifs_assert(sleb->endpt - offs >= used);
|
||||
ubifs_assert(sleb->endpt % c->min_io_size == 0);
|
||||
ubifs_assert(c, ubifs_search_bud(c, lnum));
|
||||
ubifs_assert(c, sleb->endpt - offs >= used);
|
||||
ubifs_assert(c, sleb->endpt % c->min_io_size == 0);
|
||||
|
||||
b->dirty = sleb->endpt - offs - used;
|
||||
b->free = c->leb_size - sleb->endpt;
|
||||
@@ -706,7 +707,7 @@ static int replay_buds(struct ubifs_info *c)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
ubifs_assert(b->sqnum > prev_sqnum);
|
||||
ubifs_assert(c, b->sqnum > prev_sqnum);
|
||||
prev_sqnum = b->sqnum;
|
||||
}
|
||||
|
||||
@@ -1067,7 +1068,7 @@ int ubifs_replay_journal(struct ubifs_info *c)
|
||||
c->bi.uncommitted_idx = atomic_long_read(&c->dirty_zn_cnt);
|
||||
c->bi.uncommitted_idx *= c->max_idx_node_sz;
|
||||
|
||||
ubifs_assert(c->bud_bytes <= c->max_bud_bytes || c->need_recovery);
|
||||
ubifs_assert(c, c->bud_bytes <= c->max_bud_bytes || c->need_recovery);
|
||||
dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, highest_inum %lu",
|
||||
c->lhead_lnum, c->lhead_offs, c->max_sqnum,
|
||||
(unsigned long)c->highest_inum);
|
||||
|
Criar uma nova questão referindo esta
Bloquear um utilizador