Merge tag 'fs_for_v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack...

Pull ext2, udf, and quota updates from Jan Kara:

 - conversion of ext2 directory code to use folios

 - cleanups in UDF declarations

 - bugfix for quota interaction with file encryption

* tag 'fs_for_v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2: Convert ext2_prepare_chunk and ext2_commit_chunk to folios
  ext2: Convert ext2_make_empty() to use a folio
  ext2: Convert ext2_unlink() and ext2_rename() to use folios
  ext2: Convert ext2_delete_entry() to use folios
  ext2: Convert ext2_empty_dir() to use a folio
  ext2: Convert ext2_add_link() to use a folio
  ext2: Convert ext2_readdir to use a folio
  ext2: Add ext2_get_folio()
  ext2: Convert ext2_check_page to ext2_check_folio
  highmem: Add folio_release_kmap()
  udf: Avoid unneeded variable length array in struct fileIdentDesc
  udf: Annotate struct udf_bitmap with __counted_by
  quota: explicitly forbid quota files from being encrypted

diff --cc fs/ext2/dir.c
index c7900868171b3396000e06cece4ac13581fd3c33,6807df63711274e408c8f3584986230b030e3e00..4fb155b5a958f6890522df9680310dc163e6d016
--- 1/fs/ext2/dir.c
--- 2/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@@ -466,9 -463,9 +463,9 @@@ int ext2_set_link(struct inode *dir, st
        }
        de->inode = cpu_to_le32(inode->i_ino);
        ext2_set_de_type(de, inode);
-       ext2_commit_chunk(page, pos, len);
+       ext2_commit_chunk(folio, pos, len);
        if (update_times)
 -              dir->i_mtime = inode_set_ctime_current(dir);
 +              inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
        mark_inode_dirty(dir);
        return ext2_handle_dirsync(dir);
@@@ -554,8 -551,8 +551,8 @@@ got_it
        memcpy(de->name, name, namelen);
        de->inode = cpu_to_le32(inode->i_ino);
        ext2_set_de_type (de, inode);
-       ext2_commit_chunk(page, pos, rec_len);
+       ext2_commit_chunk(folio, pos, rec_len);
 -      dir->i_mtime = inode_set_ctime_current(dir);
 +      inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
        mark_inode_dirty(dir);
        err = ext2_handle_dirsync(dir);
@@@ -605,8 -605,8 +605,8 @@@ int ext2_delete_entry(struct ext2_dir_e
        if (pde)
                pde->rec_len = ext2_rec_len_to_disk(to - from);
        dir->inode = 0;
-       ext2_commit_chunk(page, pos, to - from);
+       ext2_commit_chunk(folio, pos, to - from);
 -      inode->i_mtime = inode_set_ctime_current(inode);
 +      inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
        EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
        mark_inode_dirty(inode);
        return ext2_handle_dirsync(inode);

diff --cc fs/quota/dquot.c
Simple merge