Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-microblaze.git] / fs / ubifs / master.c

diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c
index 1a4bb9e..c6a5e39 100644 (file)
--- a/fs/ubifs/master.c
+++ b/fs/ubifs/master.c
@@ -82,7 +82,7 @@ out:
        return -EUCLEAN;
 
 out_dump:
-       ubifs_err("unexpected node type %d master LEB %d:%d",
+       ubifs_err(c, "unexpected node type %d master LEB %d:%d",
                  snod->type, lnum, snod->offs);
        ubifs_scan_destroy(sleb);
        return -EINVAL;
@@ -240,7 +240,7 @@ static int validate_master(const struct ubifs_info *c)
        return 0;
 
 out:
-       ubifs_err("bad master node at offset %d error %d", c->mst_offs, err);
+       ubifs_err(c, "bad master node at offset %d error %d", c->mst_offs, err);
        ubifs_dump_node(c, c->mst_node);
        return -EINVAL;
 }
@@ -316,7 +316,7 @@ int ubifs_read_master(struct ubifs_info *c)
 
                if (c->leb_cnt < old_leb_cnt ||
                    c->leb_cnt < UBIFS_MIN_LEB_CNT) {
-                       ubifs_err("bad leb_cnt on master node");
+                       ubifs_err(c, "bad leb_cnt on master node");
                        ubifs_dump_node(c, c->mst_node);
                        return -EINVAL;
                }