Skip to content

Commit

Permalink
UBIFS: rename random32() to prandom_u32()
Browse files Browse the repository at this point in the history
Use more preferable function name which implies using a pseudo-random
number generator.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  • Loading branch information
Akinobu Mita authored and Artem Bityutskiy committed Jan 15, 2013
1 parent 9931fac commit 3d251a5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions fs/ubifs/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -2459,7 +2459,7 @@ int dbg_check_nondata_nodes_order(struct ubifs_info *c, struct list_head *head)

static inline int chance(unsigned int n, unsigned int out_of)
{
return !!((random32() % out_of) + 1 <= n);
return !!((prandom_u32() % out_of) + 1 <= n);

}

Expand All @@ -2477,13 +2477,13 @@ static int power_cut_emulated(struct ubifs_info *c, int lnum, int write)
if (chance(1, 2)) {
d->pc_delay = 1;
/* Fail withing 1 minute */
delay = random32() % 60000;
delay = prandom_u32() % 60000;
d->pc_timeout = jiffies;
d->pc_timeout += msecs_to_jiffies(delay);
ubifs_warn("failing after %lums", delay);
} else {
d->pc_delay = 2;
delay = random32() % 10000;
delay = prandom_u32() % 10000;
/* Fail within 10000 operations */
d->pc_cnt_max = delay;
ubifs_warn("failing after %lu calls", delay);
Expand Down Expand Up @@ -2563,7 +2563,7 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf,
unsigned int from, to, ffs = chance(1, 2);
unsigned char *p = (void *)buf;

from = random32() % (len + 1);
from = prandom_u32() % (len + 1);
/* Corruption may only span one max. write unit */
to = min(len, ALIGN(from, c->max_write_size));

Expand Down
14 changes: 7 additions & 7 deletions fs/ubifs/lpt_commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -2007,28 +2007,28 @@ static int dbg_populate_lsave(struct ubifs_info *c)

if (!dbg_is_chk_gen(c))
return 0;
if (random32() & 3)
if (prandom_u32() & 3)
return 0;

for (i = 0; i < c->lsave_cnt; i++)
c->lsave[i] = c->main_first;

list_for_each_entry(lprops, &c->empty_list, list)
c->lsave[random32() % c->lsave_cnt] = lprops->lnum;
c->lsave[prandom_u32() % c->lsave_cnt] = lprops->lnum;
list_for_each_entry(lprops, &c->freeable_list, list)
c->lsave[random32() % c->lsave_cnt] = lprops->lnum;
c->lsave[prandom_u32() % c->lsave_cnt] = lprops->lnum;
list_for_each_entry(lprops, &c->frdi_idx_list, list)
c->lsave[random32() % c->lsave_cnt] = lprops->lnum;
c->lsave[prandom_u32() % c->lsave_cnt] = lprops->lnum;

heap = &c->lpt_heap[LPROPS_DIRTY_IDX - 1];
for (i = 0; i < heap->cnt; i++)
c->lsave[random32() % c->lsave_cnt] = heap->arr[i]->lnum;
c->lsave[prandom_u32() % c->lsave_cnt] = heap->arr[i]->lnum;
heap = &c->lpt_heap[LPROPS_DIRTY - 1];
for (i = 0; i < heap->cnt; i++)
c->lsave[random32() % c->lsave_cnt] = heap->arr[i]->lnum;
c->lsave[prandom_u32() % c->lsave_cnt] = heap->arr[i]->lnum;
heap = &c->lpt_heap[LPROPS_FREE - 1];
for (i = 0; i < heap->cnt; i++)
c->lsave[random32() % c->lsave_cnt] = heap->arr[i]->lnum;
c->lsave[prandom_u32() % c->lsave_cnt] = heap->arr[i]->lnum;

return 1;
}
2 changes: 1 addition & 1 deletion fs/ubifs/tnc_commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ static int alloc_idx_lebs(struct ubifs_info *c, int cnt)
c->ilebs[c->ileb_cnt++] = lnum;
dbg_cmt("LEB %d", lnum);
}
if (dbg_is_chk_index(c) && !(random32() & 7))
if (dbg_is_chk_index(c) && !(prandom_u32() & 7))
return -ENOSPC;
return 0;
}
Expand Down

0 comments on commit 3d251a5

Please sign in to comment.