Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UBIFS: simplify reply code a bit

Browse source 
In the log reply code we assume that 'c->lhead_offs' is known and may be
non-zero, which is not the case because we do not store it in the master
node and have to find out by scanning on every mount. Knowing this fact
allows us to simplify the log scanning loop a bit and remove a couple
of unneeded local variables.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
This commit is contained in:
Artem Bityutskiy 2012-07-14 20:52:58 +03:00 committed by Artem Bityutskiy
parent 06bef9451a
commit d51f17ea0a
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
fs/ubifs/replay.c
View file

@ -1007,7 +1007,7 @@ static int take_ihead(struct ubifs_info *c)
*/ */
int ubifs_replay_journal(struct ubifs_info *c) int ubifs_replay_journal(struct ubifs_info *c)
{ {
int err, i, lnum, offs, free; int err, lnum, free;
BUILD_BUG_ON(UBIFS_TRUN_KEY > 5); BUILD_BUG_ON(UBIFS_TRUN_KEY > 5);
@ -1025,25 +1025,17 @@ int ubifs_replay_journal(struct ubifs_info *c)
dbg_mnt("start replaying the journal"); dbg_mnt("start replaying the journal");
c->replaying = 1; c->replaying = 1;
lnum = c->ltail_lnum = c->lhead_lnum; lnum = c->ltail_lnum = c->lhead_lnum;
offs = c->lhead_offs;
for (i = 0; i < c->log_lebs; i++, lnum++) { lnum = UBIFS_LOG_LNUM;
if (lnum >= UBIFS_LOG_LNUM + c->log_lebs) { do {
/* err = replay_log_leb(c, lnum, 0, c->sbuf);
* The log is logically circular, we reached the last
* LEB, switch to the first one.
*/
lnum = UBIFS_LOG_LNUM;
offs = 0;
}
err = replay_log_leb(c, lnum, offs, c->sbuf);
if (err == 1) if (err == 1)
/* We hit the end of the log */ /* We hit the end of the log */
break; break;
if (err) if (err)
goto out; goto out;
offs = 0; lnum = ubifs_next_log_lnum(c, lnum);
} } while (lnum != UBIFS_LOG_LNUM);
err = replay_buds(c); err = replay_buds(c);
if (err) if (err)