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, 12 insertions, 12 deletions

diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 89adbc4d08ac..aab87340d3de 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -100,7 +100,7 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum,
                 if (pad_len < 0 ||
                     offs + node_len + pad_len > c->leb_size) {
                         if (!quiet) {
-                                ubifs_err("bad pad node at LEB %d:%d",
+                                ubifs_err(c, "bad pad node at LEB %d:%d",
                                           lnum, offs);
                                 ubifs_dump_node(c, pad);
                         }
@@ -110,7 +110,7 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum,
                 /* Make the node pads to 8-byte boundary */
                 if ((node_len + pad_len) & 7) {
                         if (!quiet)
-                                ubifs_err("bad padding length %d - %d",
+                                ubifs_err(c, "bad padding length %d - %d",
                                           offs, offs + node_len + pad_len);
                         return SCANNED_A_BAD_PAD_NODE;
                 }
@@ -152,7 +152,7 @@ struct ubifs_scan_leb *ubifs_start_scan(const struct ubifs_info *c, int lnum,
 
         err = ubifs_leb_read(c, lnum, sbuf + offs, offs, c->leb_size - offs, 0);
         if (err && err != -EBADMSG) {
-                ubifs_err("cannot read %d bytes from LEB %d:%d, error %d",
+                ubifs_err(c, "cannot read %d bytes from LEB %d:%d, error %d",
                           c->leb_size - offs, lnum, offs, err);
                 kfree(sleb);
                 return ERR_PTR(err);
@@ -240,11 +240,11 @@ void ubifs_scanned_corruption(const struct ubifs_info *c, int lnum, int offs,
 {
         int len;
 
-        ubifs_err("corruption at LEB %d:%d", lnum, offs);
+        ubifs_err(c, "corruption at LEB %d:%d", lnum, offs);
         len = c->leb_size - offs;
         if (len > 8192)
                 len = 8192;
-        ubifs_err("first %d bytes from LEB %d:%d", len, lnum, offs);
+        ubifs_err(c, "first %d bytes from LEB %d:%d", len, lnum, offs);
         print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 4, buf, len, 1);
 }
 
@@ -299,16 +299,16 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
 
                 switch (ret) {
                 case SCANNED_GARBAGE:
-                        ubifs_err("garbage");
+                        ubifs_err(c, "garbage");
                         goto corrupted;
                 case SCANNED_A_NODE:
                         break;
                 case SCANNED_A_CORRUPT_NODE:
                 case SCANNED_A_BAD_PAD_NODE:
-                        ubifs_err("bad node");
+                        ubifs_err(c, "bad node");
                         goto corrupted;
                 default:
-                        ubifs_err("unknown");
+                        ubifs_err(c, "unknown");
                         err = -EINVAL;
                         goto error;
                 }
@@ -325,7 +325,7 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
 
         if (offs % c->min_io_size) {
                 if (!quiet)
-                        ubifs_err("empty space starts at non-aligned offset %d",
+                        ubifs_err(c, "empty space starts at non-aligned offset %d",
                                   offs);
                 goto corrupted;
         }
@@ -338,7 +338,7 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
         for (; len; offs++, buf++, len--)
                 if (*(uint8_t *)buf != 0xff) {
                         if (!quiet)
-                                ubifs_err("corrupt empty space at LEB %d:%d",
+                                ubifs_err(c, "corrupt empty space at LEB %d:%d",
                                           lnum, offs);
                         goto corrupted;
                 }
@@ -348,14 +348,14 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
 corrupted:
         if (!quiet) {
                 ubifs_scanned_corruption(c, lnum, offs, buf);
-                ubifs_err("LEB %d scanning failed", lnum);
+                ubifs_err(c, "LEB %d scanning failed", lnum);
         }
         err = -EUCLEAN;
         ubifs_scan_destroy(sleb);
         return ERR_PTR(err);
 
 error:
-        ubifs_err("LEB %d scanning failed, error %d", lnum, err);
+        ubifs_err(c, "LEB %d scanning failed, error %d", lnum, err);
         ubifs_scan_destroy(sleb);
         return ERR_PTR(err);
 }