ubifs: Pass struct ubifs_info to ubifs_assert()

[sfrench/cifs-2.6.git] / fs / ubifs / budget.c

diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c
index 11a11b32a2a9013dfcb3f9e5e12c80a8e503b864..7ef22baf9d150781e97381780be20a6d9dee6d81 100644 (file)
--- a/fs/ubifs/budget.c
+++ b/fs/ubifs/budget.c
@@ -439,16 +439,16 @@ int ubifs_budget_space(struct ubifs_info *c, struct ubifs_budget_req *req)
 {
        int err, idx_growth, data_growth, dd_growth, retried = 0;
 
-       ubifs_assert(req->new_page <= 1);
-       ubifs_assert(req->dirtied_page <= 1);
-       ubifs_assert(req->new_dent <= 1);
-       ubifs_assert(req->mod_dent <= 1);
-       ubifs_assert(req->new_ino <= 1);
-       ubifs_assert(req->new_ino_d <= UBIFS_MAX_INO_DATA);
-       ubifs_assert(req->dirtied_ino <= 4);
-       ubifs_assert(req->dirtied_ino_d <= UBIFS_MAX_INO_DATA * 4);
-       ubifs_assert(!(req->new_ino_d & 7));
-       ubifs_assert(!(req->dirtied_ino_d & 7));
+       ubifs_assert(c, req->new_page <= 1);
+       ubifs_assert(c, req->dirtied_page <= 1);
+       ubifs_assert(c, req->new_dent <= 1);
+       ubifs_assert(c, req->mod_dent <= 1);
+       ubifs_assert(c, req->new_ino <= 1);
+       ubifs_assert(c, req->new_ino_d <= UBIFS_MAX_INO_DATA);
+       ubifs_assert(c, req->dirtied_ino <= 4);
+       ubifs_assert(c, req->dirtied_ino_d <= UBIFS_MAX_INO_DATA * 4);
+       ubifs_assert(c, !(req->new_ino_d & 7));
+       ubifs_assert(c, !(req->dirtied_ino_d & 7));
 
        data_growth = calc_data_growth(c, req);
        dd_growth = calc_dd_growth(c, req);
@@ -458,9 +458,9 @@ int ubifs_budget_space(struct ubifs_info *c, struct ubifs_budget_req *req)
 
 again:
        spin_lock(&c->space_lock);
-       ubifs_assert(c->bi.idx_growth >= 0);
-       ubifs_assert(c->bi.data_growth >= 0);
-       ubifs_assert(c->bi.dd_growth >= 0);
+       ubifs_assert(c, c->bi.idx_growth >= 0);
+       ubifs_assert(c, c->bi.data_growth >= 0);
+       ubifs_assert(c, c->bi.dd_growth >= 0);
 
        if (unlikely(c->bi.nospace) && (c->bi.nospace_rp || !can_use_rp(c))) {
                dbg_budg("no space");
@@ -526,20 +526,20 @@ again:
  */
 void ubifs_release_budget(struct ubifs_info *c, struct ubifs_budget_req *req)
 {
-       ubifs_assert(req->new_page <= 1);
-       ubifs_assert(req->dirtied_page <= 1);
-       ubifs_assert(req->new_dent <= 1);
-       ubifs_assert(req->mod_dent <= 1);
-       ubifs_assert(req->new_ino <= 1);
-       ubifs_assert(req->new_ino_d <= UBIFS_MAX_INO_DATA);
-       ubifs_assert(req->dirtied_ino <= 4);
-       ubifs_assert(req->dirtied_ino_d <= UBIFS_MAX_INO_DATA * 4);
-       ubifs_assert(!(req->new_ino_d & 7));
-       ubifs_assert(!(req->dirtied_ino_d & 7));
+       ubifs_assert(c, req->new_page <= 1);
+       ubifs_assert(c, req->dirtied_page <= 1);
+       ubifs_assert(c, req->new_dent <= 1);
+       ubifs_assert(c, req->mod_dent <= 1);
+       ubifs_assert(c, req->new_ino <= 1);
+       ubifs_assert(c, req->new_ino_d <= UBIFS_MAX_INO_DATA);
+       ubifs_assert(c, req->dirtied_ino <= 4);
+       ubifs_assert(c, req->dirtied_ino_d <= UBIFS_MAX_INO_DATA * 4);
+       ubifs_assert(c, !(req->new_ino_d & 7));
+       ubifs_assert(c, !(req->dirtied_ino_d & 7));
        if (!req->recalculate) {
-               ubifs_assert(req->idx_growth >= 0);
-               ubifs_assert(req->data_growth >= 0);
-               ubifs_assert(req->dd_growth >= 0);
+               ubifs_assert(c, req->idx_growth >= 0);
+               ubifs_assert(c, req->data_growth >= 0);
+               ubifs_assert(c, req->dd_growth >= 0);
        }
 
        if (req->recalculate) {
@@ -561,13 +561,13 @@ void ubifs_release_budget(struct ubifs_info *c, struct ubifs_budget_req *req)
        c->bi.dd_growth -= req->dd_growth;
        c->bi.min_idx_lebs = ubifs_calc_min_idx_lebs(c);
 
-       ubifs_assert(c->bi.idx_growth >= 0);
-       ubifs_assert(c->bi.data_growth >= 0);
-       ubifs_assert(c->bi.dd_growth >= 0);
-       ubifs_assert(c->bi.min_idx_lebs < c->main_lebs);
-       ubifs_assert(!(c->bi.idx_growth & 7));
-       ubifs_assert(!(c->bi.data_growth & 7));
-       ubifs_assert(!(c->bi.dd_growth & 7));
+       ubifs_assert(c, c->bi.idx_growth >= 0);
+       ubifs_assert(c, c->bi.data_growth >= 0);
+       ubifs_assert(c, c->bi.dd_growth >= 0);
+       ubifs_assert(c, c->bi.min_idx_lebs < c->main_lebs);
+       ubifs_assert(c, !(c->bi.idx_growth & 7));
+       ubifs_assert(c, !(c->bi.data_growth & 7));
+       ubifs_assert(c, !(c->bi.dd_growth & 7));
        spin_unlock(&c->space_lock);
 }
 
@@ -680,7 +680,7 @@ long long ubifs_get_free_space_nolock(struct ubifs_info *c)
        int rsvd_idx_lebs, lebs;
        long long available, outstanding, free;
 
-       ubifs_assert(c->bi.min_idx_lebs == ubifs_calc_min_idx_lebs(c));
+       ubifs_assert(c, c->bi.min_idx_lebs == ubifs_calc_min_idx_lebs(c));
        outstanding = c->bi.data_growth + c->bi.dd_growth;
        available = ubifs_calc_available(c, c->bi.min_idx_lebs);