summaryrefslogtreecommitdiffstats
path: root/fs/ubifs/budget.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-02 20:47:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-02 20:47:48 -0700
commit782c3fb22baa103abbcd30dfc99cad24bb09f1df (patch)
treeacda25cba653a55497f8030323437527258e747f /fs/ubifs/budget.c
parent60c7b4df82d0ec44fe10487eadec737abea55b34 (diff)
parent3668b70fcf1fdc6799abf15f70fe3f50f407ec82 (diff)
downloadop-kernel-dev-782c3fb22baa103abbcd30dfc99cad24bb09f1df.zip
op-kernel-dev-782c3fb22baa103abbcd30dfc99cad24bb09f1df.tar.gz
Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs
Pull ubifs changes from Artem Bityutskiy: "No big changes for 3.7 in UBIFS: - Error reporting and debug printing improvements - Power cut emulation fixes - Minor cleanups" Fix trivial conflict in fs/ubifs/debug.c due to the user namespace changes. * tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs: UBIFS: print less UBIFS: use pr_ helper instead of printk UBIFS: comply with coding style UBIFS: use __aligned() attribute UBIFS: remove __DATE__ and __TIME__ UBIFS: fix power cut emulation for mtdram UBIFS: improve scanning debug output UBIFS: always print full error reports UBIFS: print PID in debug messages
Diffstat (limited to 'fs/ubifs/budget.c')
-rw-r--r--fs/ubifs/budget.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c
index 969489e..e8e01d7 100644
--- a/fs/ubifs/budget.c
+++ b/fs/ubifs/budget.c
@@ -342,9 +342,8 @@ static int do_budget_space(struct ubifs_info *c)
lebs = c->lst.empty_lebs + c->freeable_cnt + c->idx_gc_cnt -
c->lst.taken_empty_lebs;
if (unlikely(rsvd_idx_lebs > lebs)) {
- dbg_budg("out of indexing space: min_idx_lebs %d (old %d), "
- "rsvd_idx_lebs %d", min_idx_lebs, c->bi.min_idx_lebs,
- rsvd_idx_lebs);
+ dbg_budg("out of indexing space: min_idx_lebs %d (old %d), rsvd_idx_lebs %d",
+ min_idx_lebs, c->bi.min_idx_lebs, rsvd_idx_lebs);
return -ENOSPC;
}
OpenPOWER on IntegriCloud