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

Pull JFFS2, UBI and UBIFS updates from Richard Weinberger:
 "JFFS2:
   - Use splice_write()
   - Fix for a slab-out-of-bounds bug

  UBI:
   - Fix for clang related warnings
   - Code cleanup

  UBIFS:
   - Fix for inode rebirth at replay
   - Set s_uuid
   - Use zstd for default filesystem"

* tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubi: Remove unnecessary struct declaration
  jffs2: Hook up splice_write callback
  jffs2: avoid Wempty-body warnings
  jffs2: Fix kasan slab-out-of-bounds problem
  ubi: Fix fall-through warnings for Clang
  ubifs: Report max LEB count at mount time
  ubifs: Set s_uuid in super block to support ima/evm uuid options
  ubifs: Default to zstd compression
  ubifs: Only check replay with inode type to judge if inode linked

diff --combined fs/ubifs/replay.c
index 4d17e5382b7410e6886c6337dd6eac9221fdf7d5,1929ec63a0cb6e8ced3b282843b53888a62c3d44..382a54c82930d5606d6c067de45f4042c186fe37
--- 1/fs/ubifs/replay.c
--- 2/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@@ -223,7 -223,8 +223,8 @@@ static bool inode_still_linked(struct u
         */
        list_for_each_entry_reverse(r, &c->replay_list, list) {
                ubifs_assert(c, r->sqnum >= rino->sqnum);
-               if (key_inum(c, &r->key) == key_inum(c, &rino->key))
+               if (key_inum(c, &r->key) == key_inum(c, &rino->key) &&
+                   key_type(c, &r->key) == UBIFS_INO_KEY)
                        return r->deletion == 0;
  
        }
@@@ -298,8 -299,8 +299,8 @@@ static int apply_replay_entry(struct ub
   * entries @a and @b by comparing their sequence numer.  Returns %1 if @a has
   * greater sequence number and %-1 otherwise.
   */
 -static int replay_entries_cmp(void *priv, struct list_head *a,
 -                            struct list_head *b)
 +static int replay_entries_cmp(void *priv, const struct list_head *a,
 +                            const struct list_head *b)
  {
        struct ubifs_info *c = priv;
        struct replay_entry *ra, *rb;