ldiskfs/kernel_patches/patches/linux-5.8/ext4-misc.patch

   1 ---
   2  fs/ext4/ext4.h   |   23 ++++++++++++++++++++++-
   3  fs/ext4/ext4_jbd2.c | 1 +
   4  fs/ext4/ialloc.c |    3 ++-
   5  fs/ext4/inode.c  |   15 +++++++++++++++
   6  fs/ext4/namei.c  |    9 ++++++---
   7  fs/ext4/super.c  |   10 ++--------
   8  5 files changed, 48 insertions(+), 13 deletions(-)
   9
  10 diff -ur a/fs/ext4/ext4.h b/fs/ext4/ext4.h
  11 --- a/fs/ext4/ext4.h    2021-06-28 08:45:39.093954644 -0600
  12 +++ b/fs/ext4/ext4.h    2021-06-28 08:46:06.913523572 -0600
  13 @@ -1764,6 +1764,8 @@
  14
  15  #define NEXT_ORPHAN(inode) EXT4_I(inode)->i_dtime
  16
  17 +#define JOURNAL_START_HAS_3ARGS        1
  18 +
  19  /*
  20   * Codes for operating systems
  21   */
  22 @@ -1995,7 +1997,21 @@
  23
  24  EXTN_FEATURE_FUNCS(2)
  25  EXTN_FEATURE_FUNCS(3)
  26 -EXTN_FEATURE_FUNCS(4)
  27 +static inline bool ext4_has_unknown_ext4_compat_features(struct super_block *sb)
  28 +{
  29 +       return ((EXT4_SB(sb)->s_es->s_feature_compat &
  30 +               cpu_to_le32(~EXT4_FEATURE_COMPAT_SUPP)) != 0);
  31 +}
  32 +static inline bool ext4_has_unknown_ext4_ro_compat_features(struct super_block *sb)
  33 +{
  34 +       return ((EXT4_SB(sb)->s_es->s_feature_ro_compat &
  35 +               cpu_to_le32(~EXT4_FEATURE_RO_COMPAT_SUPP)) != 0);
  36 +}
  37 +static inline bool ext4_has_unknown_ext4_incompat_features(struct super_block *sb)
  38 +{
  39 +       return ((EXT4_SB(sb)->s_es->s_feature_incompat &
  40 +               cpu_to_le32(~EXT4_FEATURE_INCOMPAT_SUPP)) != 0);
  41 +}
  42
  43  static inline bool ext4_has_compat_features(struct super_block *sb)
  44  {
  45 @@ -3399,6 +3415,13 @@
  46  #define EXT_MAX_BLOCKS 0xffffffff
  47
  48  extern void ext4_ext_tree_init(handle_t *handle, struct inode *inode);
  49 +extern struct buffer_head *ext4_read_inode_bitmap(struct super_block *sb,
  50 +                                                 ext4_group_t block_group);
  51 +extern void ext4_inc_count(handle_t *handle, struct inode *inode);
  52 +extern void ext4_dec_count(handle_t *handle, struct inode *inode);
  53 +extern struct buffer_head *ext4_append(handle_t *handle,
  54 +                                      struct inode *inode,
  55 +                                      ext4_lblk_t *block);
  56  extern int ext4_ext_index_trans_blocks(struct inode *inode, int extents);
  57  extern int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
  58                                struct ext4_map_blocks *map, int flags);
  59 diff -ur a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
  60 --- a/fs/ext4/ext4_jbd2.c       2021-06-28 08:45:38.905957595 -0600
  61 +++ b/fs/ext4/ext4_jbd2.c       2021-06-28 08:49:18.306817373 -0600
  62 @@ -169,6 +169,7 @@
  63         revoke_cred = max(0, revoke_cred - handle->h_revoke_credits);
  64         return ext4_journal_extend(handle, extend_cred, revoke_cred);
  65  }
  66 +EXPORT_SYMBOL(__ext4_journal_ensure_credits);
  67
  68  static void ext4_journal_abort_handle(const char *caller, unsigned int line,
  69                                       const char *err_fn,
  70 diff -ur a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
  71 --- a/fs/ext4/ialloc.c  2021-06-28 08:45:38.993956213 -0600
  72 +++ b/fs/ext4/ialloc.c  2021-06-28 08:46:06.917523511 -0600
  73 @@ -115,7 +115,7 @@
  74   *
  75   * Return buffer_head of bitmap on success, or an ERR_PTR on error.
  76   */
  77 -static struct buffer_head *
  78 +struct buffer_head *
  79  ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
  80  {
  81         struct ext4_group_desc *desc;
  82 @@ -214,6 +214,7 @@
  83         put_bh(bh);
  84         return ERR_PTR(err);
  85  }
  86 +EXPORT_SYMBOL(ext4_read_inode_bitmap);
  87
  88  /*
  89   * NOTE! When we get the inode, we're the only people
  90 diff -ur a/fs/ext4/inode.c b/fs/ext4/inode.c
  91 --- a/fs/ext4/inode.c   2021-06-28 08:45:39.069955021 -0600
  92 +++ b/fs/ext4/inode.c   2021-06-28 08:46:06.921523449 -0600
  93 @@ -6088,3 +6088,18 @@
  94
  95         return ret;
  96  }
  97 +EXPORT_SYMBOL(ext4_map_blocks);
  98 +EXPORT_SYMBOL(ext4_truncate);
  99 +EXPORT_SYMBOL(ext4_iget);
 100 +EXPORT_SYMBOL(ext4_bread);
 101 +EXPORT_SYMBOL(ext4_itable_unused_count);
 102 +EXPORT_SYMBOL(ext4_force_commit);
 103 +EXPORT_SYMBOL(__ext4_mark_inode_dirty);
 104 +EXPORT_SYMBOL(ext4_get_group_desc);
 105 +EXPORT_SYMBOL(__ext4_journal_get_write_access);
 106 +EXPORT_SYMBOL(__ext4_journal_start_sb);
 107 +EXPORT_SYMBOL(__ext4_journal_stop);
 108 +EXPORT_SYMBOL(__ext4_handle_dirty_metadata);
 109 +EXPORT_SYMBOL(__ext4_std_error);
 110 +EXPORT_SYMBOL(ext4fs_dirhash);
 111 +EXPORT_SYMBOL(ext4_get_inode_loc);
 112 diff -ur a/fs/ext4/namei.c b/fs/ext4/namei.c
 113 --- a/fs/ext4/namei.c   2021-06-28 08:45:39.093954644 -0600
 114 +++ b/fs/ext4/namei.c   2021-06-28 08:46:06.921523449 -0600
 115 @@ -50,7 +50,7 @@
 116  #define NAMEI_RA_BLOCKS  4
 117  #define NAMEI_RA_SIZE       (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
 118
 119 -static struct buffer_head *ext4_append(handle_t *handle,
 120 +struct buffer_head *ext4_append(handle_t *handle,
 121                                         struct inode *inode,
 122                                         ext4_lblk_t *block)
 123  {
 124 @@ -181,6 +181,7 @@
 125         }
 126         return bh;
 127  }
 128 +EXPORT_SYMBOL(ext4_append);
 129
 130  #ifndef assert
 131  #define assert(test) J_ASSERT(test)
 132 @@ -2584,23 +2585,25 @@
 133   * for checking S_ISDIR(inode) (since the INODE_INDEX feature will not be set
 134   * on regular files) and to avoid creating huge/slow non-HTREE directories.
 135   */
 136 -static void ext4_inc_count(handle_t *handle, struct inode *inode)
 137 +void ext4_inc_count(handle_t *handle, struct inode *inode)
 138  {
 139         inc_nlink(inode);
 140         if (is_dx(inode) &&
 141             (inode->i_nlink > EXT4_LINK_MAX || inode->i_nlink == 2))
 142                 set_nlink(inode, 1);
 143  }
 144 +EXPORT_SYMBOL(ext4_inc_count);
 145
 146  /*
 147   * If a directory had nlink == 1, then we should let it be 1. This indicates
 148   * directory has >EXT4_LINK_MAX subdirs.
 149   */
 150 -static void ext4_dec_count(handle_t *handle, struct inode *inode)
 151 +void ext4_dec_count(handle_t *handle, struct inode *inode)
 152  {
 153         if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2)
 154                 drop_nlink(inode);
 155  }
 156 +EXPORT_SYMBOL(ext4_dec_count);
 157
 158
 159  /*
 160 diff -ur a/fs/ext4/super.c b/fs/ext4/super.c
 161 --- a/fs/ext4/super.c   2021-06-28 08:45:38.909957532 -0600
 162 +++ b/fs/ext4/super.c   2021-06-28 08:46:06.921523449 -0600
 163 @@ -348,7 +348,7 @@
 164                 return;
 165         es->s_state |= cpu_to_le16(EXT4_ERROR_FS);
 166         ext4_update_tstamp(es, s_last_error_time);
 167 -       strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func));
 168 +       strlcpy(es->s_last_error_func, func, sizeof(es->s_last_error_func));
 169         es->s_last_error_line = cpu_to_le32(line);
 170         es->s_last_error_ino = cpu_to_le32(ino);
 171         es->s_last_error_block = cpu_to_le64(block);
 172 @@ -409,7 +409,7 @@
 173         if (!es->s_first_error_time) {
 174                 es->s_first_error_time = es->s_last_error_time;
 175                 es->s_first_error_time_hi = es->s_last_error_time_hi;
 176 -               strncpy(es->s_first_error_func, func,
 177 +               strlcpy(es->s_first_error_func, func,
 178                         sizeof(es->s_first_error_func));
 179                 es->s_first_error_line = cpu_to_le32(line);
 180                 es->s_first_error_ino = es->s_last_error_ino;
 181 @@ -6382,16 +6382,12 @@
 182         err = init_inodecache();
 183         if (err)
 184                 goto out1;
 185 -       register_as_ext3();
 186 -       register_as_ext2();
 187         err = register_filesystem(&ext4_fs_type);
 188         if (err)
 189                 goto out;
 190
 191         return 0;
 192  out:
 193 -       unregister_as_ext2();
 194 -       unregister_as_ext3();
 195         destroy_inodecache();
 196  out1:
 197         ext4_exit_mballoc();
 198 @@ -6414,8 +6410,6 @@
 199  static void __exit ext4_exit_fs(void)
 200  {
 201         ext4_destroy_lazyinit_thread();
 202 -       unregister_as_ext2();
 203 -       unregister_as_ext3();
 204         unregister_filesystem(&ext4_fs_type);
 205         destroy_inodecache();
 206         ext4_exit_mballoc();