Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / ubifs / tnc_commit.c

diff --git a/fs/ubifs/tnc_commit.c b/fs/ubifs/tnc_commit.c
index ff108db..42ad491 100644 (file)
--- a/fs/ubifs/tnc_commit.c
+++ b/fs/ubifs/tnc_commit.c
@@ -54,18 +54,16 @@ static int make_idx_node(struct ubifs_info *c, struct ubifs_idx_node *idx,
                br->len = cpu_to_le32(zbr->len);
                if (!zbr->lnum || !zbr->len) {
                        ubifs_err("bad ref in znode");
-                       dbg_dump_znode(c, znode);
+                       ubifs_dump_znode(c, znode);
                        if (zbr->znode)
-                               dbg_dump_znode(c, zbr->znode);
+                               ubifs_dump_znode(c, zbr->znode);
                }
        }
        ubifs_prepare_node(c, idx, len, 0);
 
-#ifdef CONFIG_UBIFS_FS_DEBUG
        znode->lnum = lnum;
        znode->offs = offs;
        znode->len = len;
-#endif
 
        err = insert_old_idx_znode(c, znode);
 
@@ -322,8 +320,7 @@ static int layout_leb_in_gaps(struct ubifs_info *c, int *p)
                                  0, 0, 0);
        if (err)
                return err;
-       err = ubifs_leb_change(c, lnum, c->ileb_buf, c->ileb_len,
-                              UBI_SHORTTERM);
+       err = ubifs_leb_change(c, lnum, c->ileb_buf, c->ileb_len);
        if (err)
                return err;
        dbg_gc("LEB %d wrote %d index nodes", lnum, tot_written);
@@ -388,8 +385,8 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt)
                                 * option which forces in-the-gaps is enabled.
                                 */
                                ubifs_warn("out of space");
-                               dbg_dump_budg(c, &c->bi);
-                               dbg_dump_lprops(c);
+                               ubifs_dump_budg(c, &c->bi);
+                               ubifs_dump_lprops(c);
                        }
                        /* Try to commit anyway */
                        err = 0;
@@ -456,11 +453,9 @@ static int layout_in_empty_space(struct ubifs_info *c)
 
                offs = buf_offs + used;
 
-#ifdef CONFIG_UBIFS_FS_DEBUG
                znode->lnum = lnum;
                znode->offs = offs;
                znode->len = len;
-#endif
 
                /* Update the parent */
                zp = znode->parent;
@@ -536,10 +531,8 @@ static int layout_in_empty_space(struct ubifs_info *c)
                break;
        }
 
-#ifdef CONFIG_UBIFS_FS_DEBUG
        c->dbg->new_ihead_lnum = lnum;
        c->dbg->new_ihead_offs = buf_offs;
-#endif
 
        return 0;
 }
@@ -864,9 +857,9 @@ static int write_index(struct ubifs_info *c)
                        br->len = cpu_to_le32(zbr->len);
                        if (!zbr->lnum || !zbr->len) {
                                ubifs_err("bad ref in znode");
-                               dbg_dump_znode(c, znode);
+                               ubifs_dump_znode(c, znode);
                                if (zbr->znode)
-                                       dbg_dump_znode(c, zbr->znode);
+                                       ubifs_dump_znode(c, zbr->znode);
                        }
                }
                len = ubifs_idx_node_sz(c, znode->child_cnt);
@@ -881,13 +874,11 @@ static int write_index(struct ubifs_info *c)
                }
                offs = buf_offs + used;
 
-#ifdef CONFIG_UBIFS_FS_DEBUG
                if (lnum != znode->lnum || offs != znode->offs ||
                    len != znode->len) {
                        ubifs_err("inconsistent znode posn");
                        return -EINVAL;
                }
-#endif
 
                /* Grab some stuff from znode while we still can */
                cnext = znode->cnext;
@@ -959,8 +950,7 @@ static int write_index(struct ubifs_info *c)
                }
 
                /* The buffer is full or there are no more znodes to do */
-               err = ubifs_leb_write(c, lnum, c->cbuf, buf_offs, blen,
-                                     UBI_SHORTTERM);
+               err = ubifs_leb_write(c, lnum, c->cbuf, buf_offs, blen);
                if (err)
                        return err;
                buf_offs += blen;
@@ -982,13 +972,11 @@ static int write_index(struct ubifs_info *c)
                break;
        }
 
-#ifdef CONFIG_UBIFS_FS_DEBUG
        if (lnum != c->dbg->new_ihead_lnum ||
            buf_offs != c->dbg->new_ihead_offs) {
                ubifs_err("inconsistent ihead");
                return -EINVAL;
        }
-#endif
 
        c->ihead_lnum = lnum;
        c->ihead_offs = buf_offs;