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

Pull UBI and UBIFS updates from Artem Bityutskiy:

UBIFS:
   * Always support xattrs    (remove the Kconfig option)
   * Always support debugging (remove the Kconfig option)
   * A fix for a memory leak on error path
   * A number of clean-ups
UBI:
   * Always support debugging (remove the Kconfig option)
   * Remove "data type" hint support
   * Huge amount of renames to prepare for the fastmap wor
   * A lot of clean-ups

* tag 'upstream-3.5-rc1' of git://git.infradead.org/linux-ubifs: (54 commits)
  UBI: modify ubi_wl_flush function to clear work queue for a lnum
  UBI: introduce UBI_ALL constant
  UBI: add lnum and vol_id to struct ubi_work
  UBI: add volume id struct ubi_ainf_peb
  UBI: add in hex the value for UBI_INTERNAL_VOL_START to comment
  UBI: rename scan.c to attach.c
  UBI: remove scan.h
  UBI: rename UBI_SCAN_UNKNOWN_EC
  UBI: move and rename attach_by_scanning
  UBI: rename _init_scan functions
  UBI: amend comments after all the renamings
  UBI: rename ubi_scan_leb_slab
  UBI: rename ubi_scan_move_to_list
  UBI: rename ubi_scan_destroy_ai
  UBI: rename ubi_scan_get_free_peb
  UBI: rename ubi_scan_rm_volume
  UBI: rename ubi_scan_find_av
  UBI: rename ubi_scan_add_used
  UBI: remove unused function
  UBI: make ubi_scan_erase_peb static and rename
  ...

1 files changed, 10 insertions, 16 deletions

diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
index 771f7fb6ce92..ef3d1ba6d992 100644
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -130,7 +130,6 @@ static int create_default_filesystem(struct ubifs_info *c)
          * orphan node.
          */
         orph_lebs = UBIFS_MIN_ORPH_LEBS;
-#ifdef CONFIG_UBIFS_FS_DEBUG
         if (c->leb_cnt - min_leb_cnt > 1)
                 /*
                  * For debugging purposes it is better to have at least 2
@@ -138,7 +137,6 @@ static int create_default_filesystem(struct ubifs_info *c)
                  * consolidations and would be stressed more.
                  */
                 orph_lebs += 1;
-#endif
 
         main_lebs = c->leb_cnt - UBIFS_SB_LEBS - UBIFS_MST_LEBS - log_lebs;
         main_lebs -= orph_lebs;
@@ -196,7 +194,7 @@ static int create_default_filesystem(struct ubifs_info *c)
         sup->rp_size = cpu_to_le64(tmp64);
         sup->ro_compat_version = cpu_to_le32(UBIFS_RO_COMPAT_VERSION);
 
-        err = ubifs_write_node(c, sup, UBIFS_SB_NODE_SZ, 0, 0, UBI_LONGTERM);
+        err = ubifs_write_node(c, sup, UBIFS_SB_NODE_SZ, 0, 0);
         kfree(sup);
         if (err)
                 return err;
@@ -252,14 +250,13 @@ static int create_default_filesystem(struct ubifs_info *c)
 
         mst->total_used = cpu_to_le64(UBIFS_INO_NODE_SZ);
 
-        err = ubifs_write_node(c, mst, UBIFS_MST_NODE_SZ, UBIFS_MST_LNUM, 0,
-                               UBI_UNKNOWN);
+        err = ubifs_write_node(c, mst, UBIFS_MST_NODE_SZ, UBIFS_MST_LNUM, 0);
         if (err) {
                 kfree(mst);
                 return err;
         }
-        err = ubifs_write_node(c, mst, UBIFS_MST_NODE_SZ, UBIFS_MST_LNUM + 1, 0,
-                               UBI_UNKNOWN);
+        err = ubifs_write_node(c, mst, UBIFS_MST_NODE_SZ, UBIFS_MST_LNUM + 1,
+                               0);
         kfree(mst);
         if (err)
                 return err;
@@ -282,8 +279,7 @@ static int create_default_filesystem(struct ubifs_info *c)
         key_write_idx(c, &key, &br->key);
         br->lnum = cpu_to_le32(main_first + DEFAULT_DATA_LEB);
         br->len  = cpu_to_le32(UBIFS_INO_NODE_SZ);
-        err = ubifs_write_node(c, idx, tmp, main_first + DEFAULT_IDX_LEB, 0,
-                               UBI_UNKNOWN);
+        err = ubifs_write_node(c, idx, tmp, main_first + DEFAULT_IDX_LEB, 0);
         kfree(idx);
         if (err)
                 return err;
@@ -315,8 +311,7 @@ static int create_default_filesystem(struct ubifs_info *c)
         ino->flags = cpu_to_le32(UBIFS_COMPR_FL);
 
         err = ubifs_write_node(c, ino, UBIFS_INO_NODE_SZ,
-                               main_first + DEFAULT_DATA_LEB, 0,
-                               UBI_UNKNOWN);
+                               main_first + DEFAULT_DATA_LEB, 0);
         kfree(ino);
         if (err)
                 return err;
@@ -335,8 +330,7 @@ static int create_default_filesystem(struct ubifs_info *c)
                 return -ENOMEM;
 
         cs->ch.node_type = UBIFS_CS_NODE;
-        err = ubifs_write_node(c, cs, UBIFS_CS_NODE_SZ, UBIFS_LOG_LNUM,
-                               0, UBI_UNKNOWN);
+        err = ubifs_write_node(c, cs, UBIFS_CS_NODE_SZ, UBIFS_LOG_LNUM, 0);
         kfree(cs);
 
         ubifs_msg("default file-system created");
@@ -475,7 +469,7 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup)
 
 failed:
         ubifs_err("bad superblock, error %d", err);
-        dbg_dump_node(c, sup);
+        ubifs_dump_node(c, sup);
         return -EINVAL;
 }
 
@@ -518,7 +512,7 @@ int ubifs_write_sb_node(struct ubifs_info *c, struct ubifs_sb_node *sup)
         int len = ALIGN(UBIFS_SB_NODE_SZ, c->min_io_size);
 
         ubifs_prepare_node(c, sup, UBIFS_SB_NODE_SZ, 1);
-        return ubifs_leb_change(c, UBIFS_SB_LNUM, sup, len, UBI_LONGTERM);
+        return ubifs_leb_change(c, UBIFS_SB_LNUM, sup, len);
 }
 
 /**
@@ -691,7 +685,7 @@ static int fixup_leb(struct ubifs_info *c, int lnum, int len)
         if (err)
                 return err;
 
-        return ubifs_leb_change(c, lnum, c->sbuf, len, UBI_UNKNOWN);
+        return ubifs_leb_change(c, lnum, c->sbuf, len);
 }
 
 /**