Merge tag 'for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull ext2 and reiserfs cleanups from Jan Kara:
 "Two small cleanups for ext2 and one for reiserfs"

* tag 'for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: Replace kmalloc with kcalloc in the comment
  ext2: code cleanup by removing ifdef macro surrounding
  ext2: Fix i_op setting for special inode

diff --combined fs/reiserfs/inode.c
index 0031070,21ad762..1509775
--- 1/fs/reiserfs/inode.c
--- 2/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@@ -1066,7 -1066,7 +1066,7 @@@ research
                        } else {
                                /* paste hole to the indirect item */
                                /*
-                                * If kmalloc failed, max_to_insert becomes
+                                * If kcalloc failed, max_to_insert becomes
                                 * zero and it means we only have space for
                                 * one block
                                 */
@@@ -1160,9 -1160,11 +1160,9 @@@ failure
        return retval;
  }
  
 -static int
 -reiserfs_readpages(struct file *file, struct address_space *mapping,
 -                 struct list_head *pages, unsigned nr_pages)
 +static void reiserfs_readahead(struct readahead_control *rac)
  {
 -      return mpage_readpages(mapping, pages, nr_pages, reiserfs_get_block);
 +      mpage_readahead(rac, reiserfs_get_block);
  }
  
  /*
@@@ -3432,7 -3434,7 +3432,7 @@@ out
  const struct address_space_operations reiserfs_address_space_operations = {
        .writepage = reiserfs_writepage,
        .readpage = reiserfs_readpage,
 -      .readpages = reiserfs_readpages,
 +      .readahead = reiserfs_readahead,
        .releasepage = reiserfs_releasepage,
        .invalidatepage = reiserfs_invalidatepage,
        .write_begin = reiserfs_write_begin,