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
  ...

diff --combined fs/ubifs/tnc.c
index abd51331345e74070924b3c83665ba73be211acb,a50b6bd2f4cec42e5eac7afe6dbe749b6ab7cde2..349f31a30f401cb488a595de91cec30cfbf9d647
--- 1/fs/ubifs/tnc.c
--- 2/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@@ -339,8 -339,8 +339,8 @@@ static int lnc_add(struct ubifs_info *c
  
        err = ubifs_validate_entry(c, dent);
        if (err) {
-               dbg_dump_stack();
-               dbg_dump_node(c, dent);
+               dump_stack();
+               ubifs_dump_node(c, dent);
                return err;
        }
  
@@@ -372,8 -372,8 +372,8 @@@ static int lnc_add_directly(struct ubif
  
        err = ubifs_validate_entry(c, node);
        if (err) {
-               dbg_dump_stack();
-               dbg_dump_node(c, node);
+               dump_stack();
+               ubifs_dump_node(c, node);
                return err;
        }
  
@@@ -1733,8 -1733,8 +1733,8 @@@ out_err
        err = -EINVAL;
  out:
        ubifs_err("bad node at LEB %d:%d", zbr->lnum, zbr->offs);
-       dbg_dump_node(c, buf);
-       dbg_dump_stack();
+       ubifs_dump_node(c, buf);
+       dump_stack();
        return err;
  }
  
@@@ -1775,7 -1775,7 +1775,7 @@@ int ubifs_tnc_bulk_read(struct ubifs_in
        if (err && err != -EBADMSG) {
                ubifs_err("failed to read from LEB %d:%d, error %d",
                          lnum, offs, err);
-               dbg_dump_stack();
+               dump_stack();
                dbg_tnck(&bu->key, "key ");
                return err;
        }
@@@ -2361,7 -2361,7 +2361,7 @@@ int ubifs_tnc_add_nm(struct ubifs_info 
                         * by passing 'ubifs_tnc_remove_nm()' the same key but
                         * an unmatchable name.
                         */
 -                      struct qstr noname = { .len = 0, .name = "" };
 +                      struct qstr noname = { .name = "" };
  
                        err = dbg_check_tnc(c, 0);
                        mutex_unlock(&c->tnc_mutex);
@@@ -2403,7 -2403,7 +2403,7 @@@ static int tnc_delete(struct ubifs_inf
  
        err = ubifs_add_dirt(c, zbr->lnum, zbr->len);
        if (err) {
-               dbg_dump_znode(c, znode);
+               ubifs_dump_znode(c, znode);
                return err;
        }
  
@@@ -2649,7 -2649,7 +2649,7 @@@ int ubifs_tnc_remove_range(struct ubifs
                        err = ubifs_add_dirt(c, znode->zbranch[i].lnum,
                                             znode->zbranch[i].len);
                        if (err) {
-                               dbg_dump_znode(c, znode);
+                               ubifs_dump_znode(c, znode);
                                goto out_unlock;
                        }
                        dbg_tnck(key, "removing key ");
@@@ -3275,8 -3275,6 +3275,6 @@@ out_unlock
        return err;
  }
  
- #ifdef CONFIG_UBIFS_FS_DEBUG
- 
  /**
   * dbg_check_inode_size - check if inode size is correct.
   * @c: UBIFS file-system description object
@@@ -3335,13 -3333,11 +3333,11 @@@ out_dump
                  (unsigned long)inode->i_ino, size,
                  ((loff_t)block) << UBIFS_BLOCK_SHIFT);
        mutex_unlock(&c->tnc_mutex);
-       dbg_dump_inode(c, inode);
-       dbg_dump_stack();
+       ubifs_dump_inode(c, inode);
+       dump_stack();
        return -EINVAL;
  
  out_unlock:
        mutex_unlock(&c->tnc_mutex);
        return err;
  }
- 
- #endif /* CONFIG_UBIFS_FS_DEBUG */

diff --combined fs/ubifs/xattr.c
index 7a8bafa19c9fbe40003643459c7d03bed02bcbfe,fd4ac85c5db3461cbb5797fb1f7c5e9595449edc..0f7139bdb2c20370f7f81489b14db155128c2f62
--- 1/fs/ubifs/xattr.c
--- 2/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@@ -298,7 -298,7 +298,7 @@@ int ubifs_setxattr(struct dentry *dentr
  {
        struct inode *inode, *host = dentry->d_inode;
        struct ubifs_info *c = host->i_sb->s_fs_info;
 -      struct qstr nm = { .name = name, .len = strlen(name) };
 +      struct qstr nm = QSTR_INIT(name, strlen(name));
        struct ubifs_dent_node *xent;
        union ubifs_key key;
        int err, type;
@@@ -361,7 -361,7 +361,7 @@@ ssize_t ubifs_getxattr(struct dentry *d
  {
        struct inode *inode, *host = dentry->d_inode;
        struct ubifs_info *c = host->i_sb->s_fs_info;
 -      struct qstr nm = { .name = name, .len = strlen(name) };
 +      struct qstr nm = QSTR_INIT(name, strlen(name));
        struct ubifs_inode *ui;
        struct ubifs_dent_node *xent;
        union ubifs_key key;
@@@ -399,8 -399,8 +399,8 @@@
        if (buf) {
                /* If @buf is %NULL we are supposed to return the length */
                if (ui->data_len > size) {
-                       dbg_err("buffer size %zd, xattr len %d",
-                               size, ui->data_len);
+                       ubifs_err("buffer size %zd, xattr len %d",
+                                 size, ui->data_len);
                        err = -ERANGE;
                        goto out_iput;
                }
@@@ -524,7 -524,7 +524,7 @@@ int ubifs_removexattr(struct dentry *de
  {
        struct inode *inode, *host = dentry->d_inode;
        struct ubifs_info *c = host->i_sb->s_fs_info;
 -      struct qstr nm = { .name = name, .len = strlen(name) };
 +      struct qstr nm = QSTR_INIT(name, strlen(name));
        struct ubifs_dent_node *xent;
        union ubifs_key key;
        int err;