Merge tag 'sound-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[firefly-linux-kernel-4.4.55.git] / fs / ubifs / commit.c

diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c
index 26b69b2d4a452488405f7ccbc2a4f179c1961bbf..63f56619991dd427c62bfd05ff7f5e7273d80d52 100644 (file)
--- a/fs/ubifs/commit.c
+++ b/fs/ubifs/commit.c
@@ -225,7 +225,7 @@ out_cancel:
 out_up:
        up_write(&c->commit_sem);
 out:
-       ubifs_err("commit failed, error %d", err);
+       ubifs_err(c, "commit failed, error %d", err);
        spin_lock(&c->cs_lock);
        c->cmt_state = COMMIT_BROKEN;
        wake_up(&c->cmt_wq);
@@ -289,7 +289,7 @@ int ubifs_bg_thread(void *info)
        int err;
        struct ubifs_info *c = info;
 
-       ubifs_msg("background thread \"%s\" started, PID %d",
+       ubifs_msg(c, "background thread \"%s\" started, PID %d",
                  c->bgt_name, current->pid);
        set_freezable();
 
@@ -324,7 +324,7 @@ int ubifs_bg_thread(void *info)
                cond_resched();
        }
 
-       ubifs_msg("background thread \"%s\" stops", c->bgt_name);
+       ubifs_msg(c, "background thread \"%s\" stops", c->bgt_name);
        return 0;
 }
 
@@ -712,13 +712,13 @@ out:
        return 0;
 
 out_dump:
-       ubifs_err("dumping index node (iip=%d)", i->iip);
+       ubifs_err(c, "dumping index node (iip=%d)", i->iip);
        ubifs_dump_node(c, idx);
        list_del(&i->list);
        kfree(i);
        if (!list_empty(&list)) {
                i = list_entry(list.prev, struct idx_node, list);
-               ubifs_err("dumping parent index node");
+               ubifs_err(c, "dumping parent index node");
                ubifs_dump_node(c, &i->idx);
        }
 out_free:
@@ -727,7 +727,7 @@ out_free:
                list_del(&i->list);
                kfree(i);
        }
-       ubifs_err("failed, error %d", err);
+       ubifs_err(c, "failed, error %d", err);
        if (err > 0)
                err = -EINVAL;
        return err;