Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

[u-boot] / fs / ubifs / budget.c

diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c
index 9ed40177cb993ccb4d137c9bef58eb81f8a497e9..1b4683fc8e769c0e3585b6f111ae57ae3e529530 100644 (file)
--- a/fs/ubifs/budget.c
+++ b/fs/ubifs/budget.c
@@ -20,7 +20,6 @@
  */
 
 #include "ubifs.h"
-#define __UBOOT__
 #ifndef __UBOOT__
 #include <linux/writeback.h>
 #else
@@ -434,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);
@@ -507,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;
 }