Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

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

diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index f116f7b..f0d51dd 100644 (file)
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -352,11 +352,11 @@ out_free:
        ubifs_err(c, "failed to recover master node");
        if (mst1) {
                ubifs_err(c, "dumping first master node");
-               ubifs_dump_node(c, mst1);
+               ubifs_dump_node(c, mst1, c->leb_size - ((void *)mst1 - buf1));
        }
        if (mst2) {
                ubifs_err(c, "dumping second master node");
-               ubifs_dump_node(c, mst2);
+               ubifs_dump_node(c, mst2, c->leb_size - ((void *)mst2 - buf2));
        }
        vfree(buf2);
        vfree(buf1);
@@ -469,7 +469,7 @@ static int no_more_nodes(const struct ubifs_info *c, void *buf, int len,
         * The area after the common header size is not empty, so the common
         * header must be intact. Check it.
         */
-       if (ubifs_check_node(c, buf, lnum, offs, 1, 0) != -EUCLEAN) {
+       if (ubifs_check_node(c, buf, len, lnum, offs, 1, 0) != -EUCLEAN) {
                dbg_rcvry("unexpected bad common header at %d:%d", lnum, offs);
                return 0;
        }