diff options
| author | Heiko Schocher <hs@denx.de> | 2015-10-22 06:19:21 +0200 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2015-10-26 09:22:36 +0100 |
| commit | 0195a7bb36a0abc71145da419001377bf56662fd (patch) | |
| tree | bca19320118d4cbeb770d94f6b1e9d3ad91dc151 /fs/ubifs/budget.c | |
| parent | 5219db8ae802210730b348a888474efc2f9bf0a4 (diff) | |
| download | blackbird-obmc-uboot-0195a7bb36a0abc71145da419001377bf56662fd.tar.gz blackbird-obmc-uboot-0195a7bb36a0abc71145da419001377bf56662fd.zip | |
ubi,ubifs: sync with linux v4.2
sync with linux v4.2
commit 64291f7db5bd8150a74ad2036f1037e6a0428df2
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun Aug 30 11:34:09 2015 -0700
Linux 4.2
This update is needed, as it turned out, that fastmap
was in experimental/broken state in kernel v3.15, which
was the last base for U-Boot.
Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Diffstat (limited to 'fs/ubifs/budget.c')
| -rw-r--r-- | fs/ubifs/budget.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index c626cbf484..1b4683fc8e 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c @@ -433,7 +433,6 @@ static int calc_dd_growth(const struct ubifs_info *c, */ int ubifs_budget_space(struct ubifs_info *c, struct ubifs_budget_req *req) { - int uninitialized_var(cmt_retries), uninitialized_var(wb_retries); int err, idx_growth, data_growth, dd_growth, retried = 0; ubifs_assert(req->new_page <= 1); @@ -506,7 +505,7 @@ again: c->bi.nospace_rp = 1; smp_wmb(); } else - ubifs_err("cannot budget space, error %d", err); + ubifs_err(c, "cannot budget space, error %d", err); return err; } |
