blk-mq: do not do head insertions post-pre-flush commands

[linux.git] / fs / ubifs / commit.c

diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c
index ad292c5a43a9abc033421d75352158e54942927d..c4fc1047fc0797f492a8f0cdf596f9f2215fd907 100644 (file)
--- a/fs/ubifs/commit.c
+++ b/fs/ubifs/commit.c
@@ -552,11 +552,11 @@ out:
  */
 int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot)
 {
  */
 int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot)
 {

-       int lnum, offs, len, err = 0, uninitialized_var(last_level), child_cnt;
+       int lnum, offs, len, err = 0, last_level, child_cnt;

        int first = 1, iip;
        struct ubifs_debug_info *d = c->dbg;
        int first = 1, iip;
        struct ubifs_debug_info *d = c->dbg;

-       union ubifs_key uninitialized_var(lower_key), upper_key, l_key, u_key;
-       unsigned long long uninitialized_var(last_sqnum);
+       union ubifs_key lower_key, upper_key, l_key, u_key;
+       unsigned long long last_sqnum;

        struct ubifs_idx_node *idx;
        struct list_head list;
        struct idx_node *i;
        struct ubifs_idx_node *idx;
        struct list_head list;
        struct idx_node *i;


@@ -701,13 +701,13 @@ out:
 
 out_dump:
        ubifs_err(c, "dumping index node (iip=%d)", i->iip);
 
 out_dump:
        ubifs_err(c, "dumping index node (iip=%d)", i->iip);

-       ubifs_dump_node(c, idx);
+       ubifs_dump_node(c, idx, ubifs_idx_node_sz(c, c->fanout));

        list_del(&i->list);
        kfree(i);
        if (!list_empty(&list)) {
                i = list_entry(list.prev, struct idx_node, list);
                ubifs_err(c, "dumping parent index node");
        list_del(&i->list);
        kfree(i);
        if (!list_empty(&list)) {
                i = list_entry(list.prev, struct idx_node, list);
                ubifs_err(c, "dumping parent index node");

-               ubifs_dump_node(c, &i->idx);
+               ubifs_dump_node(c, &i->idx, ubifs_idx_node_sz(c, c->fanout));

        }
 out_free:
        while (!list_empty(&list)) {
        }
 out_free:
        while (!list_empty(&list)) {