diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 08:15:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 08:15:18 -0700 |
| commit | 33e6c1a0de818d3698cdab27c42915661011319d (patch) | |
| tree | 763b8d7ab872471fad3a95a4bb8589903bb25880 /fs/ubifs/gc.c | |
| parent | 0b887ef19d7319263f31babc2a7855bc92865c0e (diff) | |
| parent | 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: fix debugging dump
UBIFS: improve lprops dump
UBIFS: various minor commentary fixes
UBIFS: improve journal head debugging prints
UBIFS: define journal head numbers in ubifs-media.h
UBIFS: amend commentaries
UBIFS: check ubifs_scan error codes better
UBIFS: do not print scary error messages needlessly
UBIFS: add inode size debugging check
UBIFS: constify file and inode operations
UBIFS: remove unneeded call from ubifs_sync_fs
UBIFS: kill BKL
UBIFS: remove unused functions
UBIFS: suppress compilation warning
Diffstat (limited to 'fs/ubifs/gc.c')
| -rw-r--r-- | fs/ubifs/gc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c index f0f5f15d384..618c2701d3a 100644 --- a/fs/ubifs/gc.c +++ b/fs/ubifs/gc.c @@ -529,7 +529,7 @@ int ubifs_garbage_collect_leb(struct ubifs_info *c, struct ubifs_lprops *lp) * We scan the entire LEB even though we only really need to scan up to * (c->leb_size - lp->free). */ - sleb = ubifs_scan(c, lnum, 0, c->sbuf); + sleb = ubifs_scan(c, lnum, 0, c->sbuf, 0); if (IS_ERR(sleb)) return PTR_ERR(sleb); |