Merge tag 'ubifs-for-linus-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

Pull UBI and UBIFS updates from Richard Weinberger:
 "UBI:

   - Fix error value for try_write_vid_and_data()

   - Minor cleanups

  UBIFS:

   - Fixes for various memory leaks

   - Minor cleanups"

* tag 'ubifs-for-linus-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubifs: Fix memleak when insert_old_idx() failed
  Revert "ubifs: dirty_cow_znode: Fix memleak in error handling path"
  ubifs: Fix memory leak in do_rename
  ubifs: Free memory for tmpfile name
  ubi: Fix return value overwrite issue in try_write_vid_and_data()
  ubifs: Remove return in compr_exit()
  ubi: Simplify bool conversion

diff --combined drivers/mtd/ubi/build.c
index 9cd565d,bb1a90b..8b91a55
--- 1/drivers/mtd/ubi/build.c
--- 2/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@@ -95,7 -95,7 +95,7 @@@ static DEFINE_SPINLOCK(ubi_devices_lock
  
  /* "Show" method for files in '/<sysfs>/class/ubi/' */
  /* UBI version attribute ('/<sysfs>/class/ubi/version') */
 -static ssize_t version_show(struct class *class, struct class_attribute *attr,
 +static ssize_t version_show(const struct class *class, const struct class_attribute *attr,
                            char *buf)
  {
        return sprintf(buf, "%d\n", UBI_VERSION);
@@@ -111,6 -111,7 +111,6 @@@ ATTRIBUTE_GROUPS(ubi_class)
  /* Root UBI "class" object (corresponds to '/<sysfs>/class/ubi/') */
  struct class ubi_class = {
        .name           = UBI_NAME_STR,
 -      .owner          = THIS_MODULE,
        .class_groups   = ubi_class_groups,
  };
  
@@@ -1266,7 -1267,7 +1266,7 @@@ static int __init ubi_init(void
                mutex_lock(&ubi_devices_mutex);
                err = ubi_attach_mtd_dev(mtd, p->ubi_num,
                                         p->vid_hdr_offs, p->max_beb_per1024,
-                                        p->enable_fm == 0 ? true : false);
+                                        p->enable_fm == 0);
                mutex_unlock(&ubi_devices_mutex);
                if (err < 0) {
                        pr_err("UBI error: cannot attach mtd%d\n",