ldiskfs/kernel_patches/patches/rhel8.3/ext4-misc.patch

   1 Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/ext4.h
   2 ===================================================================
   3 --- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ext4.h
   4 +++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ext4.h
   5 @@ -1591,6 +1591,8 @@ static inline void ext4_clear_state_flag
   6   */
   7  #define NEXT_ORPHAN(inode) EXT4_I(inode)->i_dtime
   8
   9 +#define JOURNAL_START_HAS_3ARGS        1
  10 +
  11  /*
  12   * Codes for operating systems
  13   */
  14 @@ -1805,7 +1807,21 @@ static inline bool ext4_has_unknown_ext#
  15
  16  EXTN_FEATURE_FUNCS(2)
  17  EXTN_FEATURE_FUNCS(3)
  18 -EXTN_FEATURE_FUNCS(4)
  19 +static inline bool ext4_has_unknown_ext4_compat_features(struct super_block *sb)
  20 +{
  21 +       return ((EXT4_SB(sb)->s_es->s_feature_compat &
  22 +               cpu_to_le32(~EXT4_FEATURE_COMPAT_SUPP)) != 0);
  23 +}
  24 +static inline bool ext4_has_unknown_ext4_ro_compat_features(struct super_block *sb)
  25 +{
  26 +       return ((EXT4_SB(sb)->s_es->s_feature_ro_compat &
  27 +               cpu_to_le32(~EXT4_FEATURE_RO_COMPAT_SUPP)) != 0);
  28 +}
  29 +static inline bool ext4_has_unknown_ext4_incompat_features(struct super_block *sb)
  30 +{
  31 +       return ((EXT4_SB(sb)->s_es->s_feature_incompat &
  32 +               cpu_to_le32(~EXT4_FEATURE_INCOMPAT_SUPP)) != 0);
  33 +}
  34
  35  static inline bool ext4_has_compat_features(struct super_block *sb)
  36  {
  37 @@ -3111,6 +3127,11 @@ struct ext4_extent;
  38
  39  extern int ext4_ext_tree_init(handle_t *handle, struct inode *);
  40  extern int ext4_ext_writepage_trans_blocks(struct inode *, int);
  41 +extern struct buffer_head *ext4_read_inode_bitmap(struct super_block *sb,
  42 +                                                 ext4_group_t block_group);
  43 +extern struct buffer_head *ext4_append(handle_t *handle,
  44 +                                      struct inode *inode,
  45 +                                      ext4_lblk_t *block);
  46  extern int ext4_ext_index_trans_blocks(struct inode *inode, int extents);
  47  extern int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
  48                                struct ext4_map_blocks *map, int flags);
  49 Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c
  50 ===================================================================
  51 --- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ialloc.c
  52 +++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c
  53 @@ -114,7 +114,7 @@ verified:
  54   *
  55   * Return buffer_head of bitmap on success or NULL.
  56   */
  57 -static struct buffer_head *
  58 +struct buffer_head *
  59  ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
  60  {
  61         struct ext4_group_desc *desc;
  62 @@ -211,6 +211,7 @@ out:
  63         put_bh(bh);
  64         return ERR_PTR(err);
  65  }
  66 +EXPORT_SYMBOL(ext4_read_inode_bitmap);
  67
  68  /*
  69   * NOTE! When we get the inode, we're the only people
  70 Index: linux-4.18.0-240.1.1.el8/fs/ext4/inode.c
  71 ===================================================================
  72 --- linux-4.18.0-240.1.1.el8.orig/fs/ext4/inode.c
  73 +++ linux-4.18.0-240.1.1.el8/fs/ext4/inode.c
  74 @@ -6343,3 +6343,19 @@ vm_fault_t ext4_filemap_fault(struct vm_
  75
  76         return ret;
  77  }
  78 +EXPORT_SYMBOL(ext4_map_blocks);
  79 +EXPORT_SYMBOL(ext4_truncate);
  80 +EXPORT_SYMBOL(__ext4_iget);
  81 +EXPORT_SYMBOL(ext4_bread);
  82 +EXPORT_SYMBOL(ext4_itable_unused_count);
  83 +EXPORT_SYMBOL(ext4_force_commit);
  84 +EXPORT_SYMBOL(ext4_mark_inode_dirty);
  85 +EXPORT_SYMBOL(ext4_get_group_desc);
  86 +EXPORT_SYMBOL(__ext4_journal_get_write_access);
  87 +EXPORT_SYMBOL(__ext4_journal_start_sb);
  88 +EXPORT_SYMBOL(__ext4_journal_stop);
  89 +EXPORT_SYMBOL(__ext4_handle_dirty_metadata);
  90 +EXPORT_SYMBOL(__ext4_std_error);
  91 +EXPORT_SYMBOL(ext4fs_dirhash);
  92 +EXPORT_SYMBOL(ext4_get_inode_loc);
  93 +EXPORT_SYMBOL(__ext4_journal_ensure_credits);
  94 Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/namei.c
  95 ===================================================================
  96 --- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/namei.c
  97 +++ linux-4.18.0-80.1.2.el8_0/fs/ext4/namei.c
  98 @@ -49,7 +49,7 @@
  99  #define NAMEI_RA_BLOCKS  4
 100  #define NAMEI_RA_SIZE       (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
 101
 102 -static struct buffer_head *ext4_append(handle_t *handle,
 103 +struct buffer_head *ext4_append(handle_t *handle,
 104                                         struct inode *inode,
 105                                         ext4_lblk_t *block)
 106  {
 107 @@ -160,6 +160,7 @@ static struct buffer_head *__ext4_read_d
 108         }
 109         return bh;
 110  }
 111 +EXPORT_SYMBOL(ext4_append);
 112
 113  #ifndef assert
 114  #define assert(test) J_ASSERT(test)
 115 @@ -2415,23 +2416,25 @@ EXPORT_SYMBOL(ext4_delete_entry);
 116   * for checking S_ISDIR(inode) (since the INODE_INDEX feature will not be set
 117   * on regular files) and to avoid creating huge/slow non-HTREE directories.
 118   */
 119 -static void ext4_inc_count(handle_t *handle, struct inode *inode)
 120 +void ext4_inc_count(handle_t *handle, struct inode *inode)
 121  {
 122         inc_nlink(inode);
 123         if (is_dx(inode) &&
 124             (inode->i_nlink > EXT4_LINK_MAX || inode->i_nlink == 2))
 125                 set_nlink(inode, 1);
 126  }
 127 +EXPORT_SYMBOL(ext4_inc_count);
 128
 129  /*
 130   * If a directory had nlink == 1, then we should let it be 1. This indicates
 131   * directory has >EXT4_LINK_MAX subdirs.
 132   */
 133 -static void ext4_dec_count(handle_t *handle, struct inode *inode)
 134 +void ext4_dec_count(handle_t *handle, struct inode *inode)
 135  {
 136         if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2)
 137                 drop_nlink(inode);
 138  }
 139 +EXPORT_SYMBOL(ext4_dec_count);
 140
 141
 142  static int ext4_add_nondir(handle_t *handle,
 143 Index: linux-4.18.0-240.1.1.el8/fs/ext4/super.c
 144 ===================================================================
 145 --- linux-4.18.0-240.1.1.el8.orig/fs/ext4/super.c
 146 +++ linux-4.18.0-240.1.1.el8/fs/ext4/super.c
 147 @@ -366,7 +366,7 @@ static void __save_error_info(struct sup
 148                 return;
 149         es->s_state |= cpu_to_le16(EXT4_ERROR_FS);
 150         ext4_update_tstamp(es, s_last_error_time);
 151 -       strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func));
 152 +       strlcpy(es->s_last_error_func, func, sizeof(es->s_last_error_func));
 153         es->s_last_error_line = cpu_to_le32(line);
 154         es->s_last_error_ino = cpu_to_le32(ino);
 155         es->s_last_error_block = cpu_to_le64(block);
 156 @@ -427,7 +427,7 @@ static void __save_error_info(struct sup
 157         if (!es->s_first_error_time) {
 158                 es->s_first_error_time = es->s_last_error_time;
 159                 es->s_first_error_time_hi = es->s_last_error_time_hi;
 160 -               strncpy(es->s_first_error_func, func,
 161 +               strlcpy(es->s_first_error_func, func,
 162                         sizeof(es->s_first_error_func));
 163                 es->s_first_error_line = cpu_to_le32(line);
 164                 es->s_first_error_ino = es->s_last_error_ino;
 165 @@ -6152,16 +6152,12 @@ static int __init ext4_init_fs(void)
 166         err = init_inodecache();
 167         if (err)
 168                 goto out1;
 169 -       register_as_ext3();
 170 -       register_as_ext2();
 171         err = register_filesystem(&ext4_fs_type);
 172         if (err)
 173                 goto out;
 174
 175         return 0;
 176  out:
 177 -       unregister_as_ext2();
 178 -       unregister_as_ext3();
 179         destroy_inodecache();
 180  out1:
 181         ext4_exit_mballoc();
 182 @@ -6182,8 +6178,6 @@ out6:
 183  static void __exit ext4_exit_fs(void)
 184  {
 185         ext4_destroy_lazyinit_thread();
 186 -       unregister_as_ext2();
 187 -       unregister_as_ext3();
 188         unregister_filesystem(&ext4_fs_type);
 189         destroy_inodecache();
 190         ext4_exit_mballoc();