diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 15:28:45 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 15:28:45 +0900 |
| commit | fbe43ff0031ded2b8500382da17d5d815a9c3edd (patch) | |
| tree | bb10258396c467b83be10d1a3ee41ab33213cb1a /fs/ubifs/gc.c | |
| parent | a7fa20a594fadf1e37cb3469c880ce6a544d3c3b (diff) | |
| parent | 58a4e23703b22c331b01fbd0c12161aadaa6d50b (diff) | |
Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs
Pull ubifs changes from Artem Bityutskiy:
"Mostly fixes for the power cut emulation UBIFS mode, and only one
functional change which fixes a return error code"
* tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs:
UBIFS: correct data corruption range
UBIFS: fix return code
UBIFS: remove unnecessary code in ubifs_garbage_collect
Diffstat (limited to 'fs/ubifs/gc.c')
| -rw-r--r-- | fs/ubifs/gc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c index 76ca53cd3eee..9718da86ad01 100644 --- a/fs/ubifs/gc.c +++ b/fs/ubifs/gc.c @@ -668,8 +668,7 @@ int ubifs_garbage_collect(struct ubifs_info *c, int anyway) ubifs_assert(!wbuf->used); for (i = 0; ; i++) { - int space_before = c->leb_size - wbuf->offs - wbuf->used; - int space_after; + int space_before, space_after; cond_resched(); |