SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / fs / ubifs / tnc_misc.c

diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c
index 81bdad920344b3c23563ef2814bf187fbfab9971..b8ea7e9ddb67b5aa7f99fabee8ae30b381ae2b66 100644 (file)
--- a/fs/ubifs/tnc_misc.c
+++ b/fs/ubifs/tnc_misc.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * This file is part of UBIFS.
  *
  * Copyright (C) 2006-2008 Nokia Corporation.
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Authors: Adrian Hunter
  *          Artem Bityutskiy (Битюцкий Артём)
  */
@@ -16,7 +15,6 @@
  * putting it all in one file would make that file too big and unreadable.
  */
 
-#define __UBOOT__
 #ifdef __UBOOT__
 #include <linux/err.h>
 #endif
@@ -286,9 +284,9 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len,
                lnum, offs, znode->level, znode->child_cnt);
 
        if (znode->child_cnt > c->fanout || znode->level > UBIFS_MAX_LEVELS) {
-               ubifs_err("current fanout %d, branch count %d",
+               ubifs_err(c, "current fanout %d, branch count %d",
                          c->fanout, znode->child_cnt);
-               ubifs_err("max levels %d, znode level %d",
+               ubifs_err(c, "max levels %d, znode level %d",
                          UBIFS_MAX_LEVELS, znode->level);
                err = 1;
                goto out_dump;
@@ -309,7 +307,7 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len,
                if (zbr->lnum < c->main_first ||
                    zbr->lnum >= c->leb_cnt || zbr->offs < 0 ||
                    zbr->offs + zbr->len > c->leb_size || zbr->offs & 7) {
-                       ubifs_err("bad branch %d", i);
+                       ubifs_err(c, "bad branch %d", i);
                        err = 2;
                        goto out_dump;
                }
@@ -321,7 +319,7 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len,
                case UBIFS_XENT_KEY:
                        break;
                default:
-                       ubifs_err("bad key type at slot %d: %d",
+                       ubifs_err(c, "bad key type at slot %d: %d",
                                  i, key_type(c, &zbr->key));
                        err = 3;
                        goto out_dump;
@@ -333,17 +331,17 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len,
                type = key_type(c, &zbr->key);
                if (c->ranges[type].max_len == 0) {
                        if (zbr->len != c->ranges[type].len) {
-                               ubifs_err("bad target node (type %d) length (%d)",
+                               ubifs_err(c, "bad target node (type %d) length (%d)",
                                          type, zbr->len);
-                               ubifs_err("have to be %d", c->ranges[type].len);
+                               ubifs_err(c, "have to be %d", c->ranges[type].len);
                                err = 4;
                                goto out_dump;
                        }
                } else if (zbr->len < c->ranges[type].min_len ||
                           zbr->len > c->ranges[type].max_len) {
-                       ubifs_err("bad target node (type %d) length (%d)",
+                       ubifs_err(c, "bad target node (type %d) length (%d)",
                                  type, zbr->len);
-                       ubifs_err("have to be in range of %d-%d",
+                       ubifs_err(c, "have to be in range of %d-%d",
                                  c->ranges[type].min_len,
                                  c->ranges[type].max_len);
                        err = 5;
@@ -363,12 +361,12 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len,
 
                cmp = keys_cmp(c, key1, key2);
                if (cmp > 0) {
-                       ubifs_err("bad key order (keys %d and %d)", i, i + 1);
+                       ubifs_err(c, "bad key order (keys %d and %d)", i, i + 1);
                        err = 6;
                        goto out_dump;
                } else if (cmp == 0 && !is_hash_key(c, key1)) {
                        /* These can only be keys with colliding hash */
-                       ubifs_err("keys %d and %d are not hashed but equivalent",
+                       ubifs_err(c, "keys %d and %d are not hashed but equivalent",
                                  i, i + 1);
                        err = 7;
                        goto out_dump;
@@ -379,7 +377,7 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len,
        return 0;
 
 out_dump:
-       ubifs_err("bad indexing node at LEB %d:%d, error %d", lnum, offs, err);
+       ubifs_err(c, "bad indexing node at LEB %d:%d, error %d", lnum, offs, err);
        ubifs_dump_node(c, idx);
        kfree(idx);
        return -EINVAL;
@@ -475,7 +473,7 @@ int ubifs_tnc_read_node(struct ubifs_info *c, struct ubifs_zbranch *zbr,
        /* Make sure the key of the read node is correct */
        key_read(c, node + UBIFS_KEY_OFFSET, &key1);
        if (!keys_eq(c, key, &key1)) {
-               ubifs_err("bad key in node at LEB %d:%d",
+               ubifs_err(c, "bad key in node at LEB %d:%d",
                          zbr->lnum, zbr->offs);
                dbg_tnck(key, "looked for key ");
                dbg_tnck(&key1, "but found node's key ");