Merge tag 'upstream-4.1-rc1' of git://git.infradead.org/linux-ubifs

Pull UBI/UBIFS updates from Richard Weinberger:
 "This pull request includes the following UBI/UBIFS changes:

   - powercut emulation for UBI
   - a huge update to UBI Fastmap
   - cleanups and bugfixes all over UBI and UBIFS"

* tag 'upstream-4.1-rc1' of git://git.infradead.org/linux-ubifs: (50 commits)
  UBI: power cut emulation for testing
  UBIFS: fix output format of INUM_WATERMARK
  UBI: Fastmap: Fall back to scanning mode after ECC error
  UBI: Fastmap: Remove is_fm_block()
  UBI: Fastmap: Add blank line after declarations
  UBI: Fastmap: Remove else after return.
  UBI: Fastmap: Introduce may_reserve_for_fm()
  UBI: Fastmap: Introduce ubi_fastmap_init()
  UBI: Fastmap: Wire up WL accessor functions
  UBI: Add accessor functions for WL data structures
  UBI: Move fastmap specific functions out of wl.c
  UBI: Fastmap: Add new module parameter fm_debug
  UBI: Fastmap: Make self_check_eba() depend on fastmap self checking
  UBI: Fastmap: Add self check to detect absent PEBs
  UBI: Fix stale pointers in ubi->lookuptbl
  UBI: Fastmap: Enhance fastmap checking
  UBI: Add initial support for fastmap self checks
  UBI: Fastmap: Rework fastmap error paths
  UBI: Fastmap: Prepare for variable sized fastmaps
  UBI: Fastmap: Locking updates
  ...

1 files changed, 17 insertions, 17 deletions

diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 9b40a1c5e160..3ca4540130b5 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -458,13 +458,13 @@ int ubifs_validate_entry(struct ubifs_info *c,
             nlen > UBIFS_MAX_NLEN || dent->name[nlen] != 0 ||
             strnlen(dent->name, nlen) != nlen ||
             le64_to_cpu(dent->inum) > MAX_INUM) {
-                ubifs_err("bad %s node", key_type == UBIFS_DENT_KEY ?
+                ubifs_err(c, "bad %s node", key_type == UBIFS_DENT_KEY ?
                           "directory entry" : "extended attribute entry");
                 return -EINVAL;
         }
 
         if (key_type != UBIFS_DENT_KEY && key_type != UBIFS_XENT_KEY) {
-                ubifs_err("bad key type %d", key_type);
+                ubifs_err(c, "bad key type %d", key_type);
                 return -EINVAL;
         }
 
@@ -589,7 +589,7 @@ static int replay_bud(struct ubifs_info *c, struct bud_entry *b)
                 cond_resched();
 
                 if (snod->sqnum >= SQNUM_WATERMARK) {
-                        ubifs_err("file system's life ended");
+                        ubifs_err(c, "file system's life ended");
                         goto out_dump;
                 }
 
@@ -647,7 +647,7 @@ static int replay_bud(struct ubifs_info *c, struct bud_entry *b)
                         if (old_size < 0 || old_size > c->max_inode_sz ||
                             new_size < 0 || new_size > c->max_inode_sz ||
                             old_size <= new_size) {
-                                ubifs_err("bad truncation node");
+                                ubifs_err(c, "bad truncation node");
                                 goto out_dump;
                         }
 
@@ -662,7 +662,7 @@ static int replay_bud(struct ubifs_info *c, struct bud_entry *b)
                         break;
                 }
                 default:
-                        ubifs_err("unexpected node type %d in bud LEB %d:%d",
+                        ubifs_err(c, "unexpected node type %d in bud LEB %d:%d",
                                   snod->type, lnum, snod->offs);
                         err = -EINVAL;
                         goto out_dump;
@@ -685,7 +685,7 @@ out:
         return err;
 
 out_dump:
-        ubifs_err("bad node is at LEB %d:%d", lnum, snod->offs);
+        ubifs_err(c, "bad node is at LEB %d:%d", lnum, snod->offs);
         ubifs_dump_node(c, snod->node);
         ubifs_scan_destroy(sleb);
         return -EINVAL;
@@ -805,7 +805,7 @@ static int validate_ref(struct ubifs_info *c, const struct ubifs_ref_node *ref)
         if (bud) {
                 if (bud->jhead == jhead && bud->start <= offs)
                         return 1;
-                ubifs_err("bud at LEB %d:%d was already referred", lnum, offs);
+                ubifs_err(c, "bud at LEB %d:%d was already referred", lnum, offs);
                 return -EINVAL;
         }
 
@@ -861,12 +861,12 @@ static int replay_log_leb(struct ubifs_info *c, int lnum, int offs, void *sbuf)
                  * numbers.
                  */
                 if (snod->type != UBIFS_CS_NODE) {
-                        ubifs_err("first log node at LEB %d:%d is not CS node",
+                        ubifs_err(c, "first log node at LEB %d:%d is not CS node",
                                   lnum, offs);
                         goto out_dump;
                 }
                 if (le64_to_cpu(node->cmt_no) != c->cmt_no) {
-                        ubifs_err("first CS node at LEB %d:%d has wrong commit number %llu expected %llu",
+                        ubifs_err(c, "first CS node at LEB %d:%d has wrong commit number %llu expected %llu",
                                   lnum, offs,
                                   (unsigned long long)le64_to_cpu(node->cmt_no),
                                   c->cmt_no);
@@ -891,7 +891,7 @@ static int replay_log_leb(struct ubifs_info *c, int lnum, int offs, void *sbuf)
 
         /* Make sure the first node sits at offset zero of the LEB */
         if (snod->offs != 0) {
-                ubifs_err("first node is not at zero offset");
+                ubifs_err(c, "first node is not at zero offset");
                 goto out_dump;
         }
 
@@ -899,12 +899,12 @@ static int replay_log_leb(struct ubifs_info *c, int lnum, int offs, void *sbuf)
                 cond_resched();
 
                 if (snod->sqnum >= SQNUM_WATERMARK) {
-                        ubifs_err("file system's life ended");
+                        ubifs_err(c, "file system's life ended");
                         goto out_dump;
                 }
 
                 if (snod->sqnum < c->cs_sqnum) {
-                        ubifs_err("bad sqnum %llu, commit sqnum %llu",
+                        ubifs_err(c, "bad sqnum %llu, commit sqnum %llu",
                                   snod->sqnum, c->cs_sqnum);
                         goto out_dump;
                 }
@@ -934,12 +934,12 @@ static int replay_log_leb(struct ubifs_info *c, int lnum, int offs, void *sbuf)
                 case UBIFS_CS_NODE:
                         /* Make sure it sits at the beginning of LEB */
                         if (snod->offs != 0) {
-                                ubifs_err("unexpected node in log");
+                                ubifs_err(c, "unexpected node in log");
                                 goto out_dump;
                         }
                         break;
                 default:
-                        ubifs_err("unexpected node in log");
+                        ubifs_err(c, "unexpected node in log");
                         goto out_dump;
                 }
         }
@@ -955,7 +955,7 @@ out:
         return err;
 
 out_dump:
-        ubifs_err("log error detected while replaying the log at LEB %d:%d",
+        ubifs_err(c, "log error detected while replaying the log at LEB %d:%d",
                   lnum, offs + snod->offs);
         ubifs_dump_node(c, snod->node);
         ubifs_scan_destroy(sleb);
@@ -1017,7 +1017,7 @@ int ubifs_replay_journal(struct ubifs_info *c)
                 return free; /* Error code */
 
         if (c->ihead_offs != c->leb_size - free) {
-                ubifs_err("bad index head LEB %d:%d", c->ihead_lnum,
+                ubifs_err(c, "bad index head LEB %d:%d", c->ihead_lnum,
                           c->ihead_offs);
                 return -EINVAL;
         }
@@ -1040,7 +1040,7 @@ int ubifs_replay_journal(struct ubifs_info *c)
                          * someting went wrong and we cannot proceed mounting
                          * the file-system.
                          */
-                        ubifs_err("no UBIFS nodes found at the log head LEB %d:%d, possibly corrupted",
+                        ubifs_err(c, "no UBIFS nodes found at the log head LEB %d:%d, possibly corrupted",
                                   lnum, 0);
                         err = -EINVAL;
                 }