diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-26 08:20:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-26 08:20:26 -0700 |
commit | bde40fe071e327857b478a440c599f54d4fc14dd (patch) | |
tree | 20aa357126bfbbe38962c4933616ed8e1c4cdafd /fs/ubifs/find.c | |
parent | 6ef190cc92e33565accff6a320f0e7d90480bfe7 (diff) | |
parent | 7424bac82ff3bd956ea04101550e01bdae17284d (diff) |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6
* 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6:
UBIFS: fix printk format warnings
UBIFS: remove incorrect assert
UBIFS: TNC / GC race fixes
UBIFS: create the name of the background thread in every case
Diffstat (limited to 'fs/ubifs/find.c')
-rw-r--r-- | fs/ubifs/find.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c index e045c8b5542..47814cde240 100644 --- a/fs/ubifs/find.c +++ b/fs/ubifs/find.c @@ -507,7 +507,6 @@ int ubifs_find_free_space(struct ubifs_info *c, int min_space, int *free, rsvd_idx_lebs = 0; lebs = c->lst.empty_lebs + c->freeable_cnt + c->idx_gc_cnt - c->lst.taken_empty_lebs; - ubifs_assert(lebs + c->lst.idx_lebs >= c->min_idx_lebs); if (rsvd_idx_lebs < lebs) /* * OK to allocate an empty LEB, but we still don't want to go |