tpm: st33zp24: fix STMicroelectronics copyright

[people/ms/u-boot.git] / fs / ubifs / master.c

diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c
index 00ca855e818cad8f7c51017f7fa32e907972e885..4dd0bbb2d3f25d61187059997ed48d4928574b72 100644 (file)
--- a/fs/ubifs/master.c
+++ b/fs/ubifs/master.c
@@ -11,7 +11,6 @@
 
 /* This file implements reading and writing the master node */
 
-#define __UBOOT__
 #include "ubifs.h"
 #ifdef __UBOOT__
 #include <linux/compat.h>
@@ -77,7 +76,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;
@@ -235,7 +234,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;
 }
@@ -311,7 +310,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;
                }
@@ -350,10 +349,9 @@ int ubifs_read_master(struct ubifs_info *c)
  * ubifs_write_master - write master node.
  * @c: UBIFS file-system description object
  *
- * This function writes the master node. The caller has to take the
- * @c->mst_mutex lock before calling this function. Returns zero in case of
- * success and a negative error code in case of failure. The master node is
- * written twice to enable recovery.
+ * This function writes the master node. Returns zero in case of success and a
+ * negative error code in case of failure. The master node is written twice to
+ * enable recovery.
  */
 int ubifs_write_master(struct ubifs_info *c)
 {