From 2fb664c2cb57f93dadad8465acb2e849fcf23d21 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 18 Oct 2010 10:00:40 +0300 Subject: [PATCH] --- yaml --- r: 213016 b: refs/heads/master c: 6599fcbd01baf9d57e847db103d215ea4ec088f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ubifs/replay.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fd291c3222c1..0809232fa412 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3601ba27353a968df843454e4b81155376682505 +refs/heads/master: 6599fcbd01baf9d57e847db103d215ea4ec088f9 diff --git a/trunk/fs/ubifs/replay.c b/trunk/fs/ubifs/replay.c index 7df04ba4878e..eed0fcff8d73 100644 --- a/trunk/fs/ubifs/replay.c +++ b/trunk/fs/ubifs/replay.c @@ -1013,7 +1013,6 @@ static int take_ihead(struct ubifs_info *c) int ubifs_replay_journal(struct ubifs_info *c) { int err, i, lnum, offs, free; - void *sbuf = NULL; BUILD_BUG_ON(UBIFS_TRUN_KEY > 5); @@ -1028,10 +1027,6 @@ int ubifs_replay_journal(struct ubifs_info *c) return -EINVAL; } - sbuf = vmalloc(c->leb_size); - if (!sbuf) - return -ENOMEM; - dbg_mnt("start replaying the journal"); c->replaying = 1; lnum = c->ltail_lnum = c->lhead_lnum; @@ -1046,7 +1041,7 @@ int ubifs_replay_journal(struct ubifs_info *c) lnum = UBIFS_LOG_LNUM; offs = 0; } - err = replay_log_leb(c, lnum, offs, sbuf); + err = replay_log_leb(c, lnum, offs, c->sbuf); if (err == 1) /* We hit the end of the log */ break; @@ -1079,7 +1074,6 @@ int ubifs_replay_journal(struct ubifs_info *c) out: destroy_replay_tree(c); destroy_bud_list(c); - vfree(sbuf); c->replaying = 0; return err; }