diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-04-26 10:07:50 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-05-13 19:23:55 +0300 |
| commit | bcdca3e10ac22c208955a63c907a0988550bc666 (patch) | |
| tree | f6afca170ebb3024a28814af050c706888f2cfaa /fs/ubifs/recovery.c | |
| parent | 2405f5948119cdc1c28697fd3110124dad974898 (diff) | |
| download | op-kernel-dev-bcdca3e10ac22c208955a63c907a0988550bc666.zip op-kernel-dev-bcdca3e10ac22c208955a63c907a0988550bc666.tar.gz | |
UBIFS: remove dead GC LEB recovery piece of code
This patch removes a piece of code in 'ubifs_rcvry_gc_commit()' which is never
executed. We call 'ubifs_find_dirty_leb()' function with min_space =
wbuf->offs, so if it returns us an LEB, it is guaranteed to have at lease
'wbuf->offs' bytes of free+dirty space. So we can remove the subsequent code
which deals with "returned LEB has less than 'wbuf->offs' bytes of free+dirty
space". This simplifies 'ubifs_rcvry_gc_commit()' a little.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs/recovery.c')
| -rw-r--r-- | fs/ubifs/recovery.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 1a72046..3e0eedbe 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -1127,21 +1127,10 @@ int ubifs_rcvry_gc_commit(struct ubifs_info *c) } ubifs_assert(!(lp.flags & LPROPS_INDEX)); + ubifs_assert(lp.free + lp.dirty >= wbuf->offs); lnum = lp.lnum; /* - * There was no empty LEB so the used space in the dirtiest LEB must fit - * in the GC head LEB. - */ - if (lp.free + lp.dirty < wbuf->offs) { - dbg_rcvry("LEB %d doesn't fit in GC head LEB %d:%d", - lnum, wbuf->lnum, wbuf->offs); - err = ubifs_return_leb(c, lnum); - if (err) - return err; - goto find_free; - } - /* * We run the commit before garbage collection otherwise subsequent * mounts will see the GC and orphan deletion in a different order. */ |
