ldiskfs/kernel_patches/patches/ubuntu18/ext4-misc.patch

   1 Index: linux-4.15.0/fs/ext4/ext4.h
   2 ===================================================================
   3 --- linux-4.15.0.orig/fs/ext4/ext4.h
   4 +++ linux-4.15.0/fs/ext4/ext4.h
   5 @@ -1587,6 +1587,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 @@ -1801,7 +1803,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 @@ -3103,6 +3119,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.15.0/fs/ext4/ialloc.c
  50 ===================================================================
  51 --- linux-4.15.0.orig/fs/ext4/ialloc.c
  52 +++ linux-4.15.0/fs/ext4/ialloc.c
  53 @@ -156,7 +156,7 @@ static int ext4_validate_inode_bitmap(st
  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 @@ -236,6 +236,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.15.0/fs/ext4/inode.c
  71 ===================================================================
  72 --- linux-4.15.0.orig/fs/ext4/inode.c
  73 +++ linux-4.15.0/fs/ext4/inode.c
  74 @@ -6179,3 +6179,18 @@ int ext4_filemap_fault(struct vm_fault *
  75
  76         return err;
  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 Index: linux-4.15.0/fs/ext4/mballoc.c
  94 ===================================================================
  95 --- linux-4.15.0.orig/fs/ext4/mballoc.c
  96 +++ linux-4.15.0/fs/ext4/mballoc.c
  97 @@ -721,7 +721,6 @@ void ext4_mb_generate_buddy(struct super
  98                                 void *buddy, void *bitmap, ext4_group_t group)
  99  {
 100         struct ext4_group_info *grp = ext4_get_group_info(sb, group);
 101 -       struct ext4_sb_info *sbi = EXT4_SB(sb);
 102         ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb);
 103         ext4_grpblk_t i = 0;
 104         ext4_grpblk_t first;
 105 Index: linux-4.15.0/fs/ext4/namei.c
 106 ===================================================================
 107 --- linux-4.15.0.orig/fs/ext4/namei.c
 108 +++ linux-4.15.0/fs/ext4/namei.c
 109 @@ -48,7 +48,7 @@
 110  #define NAMEI_RA_BLOCKS  4
 111  #define NAMEI_RA_SIZE       (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
 112
 113 -static struct buffer_head *ext4_append(handle_t *handle,
 114 +struct buffer_head *ext4_append(handle_t *handle,
 115                                         struct inode *inode,
 116                                         ext4_lblk_t *block)
 117  {
 118 @@ -158,6 +158,7 @@ static struct buffer_head *__ext4_read_d
 119         }
 120         return bh;
 121  }
 122 +EXPORT_SYMBOL(ext4_append);
 123
 124  #ifndef assert
 125  #define assert(test) J_ASSERT(test)
 126 @@ -2412,23 +2413,25 @@ EXPORT_SYMBOL(ext4_delete_entry);
 127   * for checking S_ISDIR(inode) (since the INODE_INDEX feature will not be set
 128   * on regular files) and to avoid creating huge/slow non-HTREE directories.
 129   */
 130 -static void ext4_inc_count(handle_t *handle, struct inode *inode)
 131 +void ext4_inc_count(handle_t *handle, struct inode *inode)
 132  {
 133         inc_nlink(inode);
 134         if (is_dx(inode) &&
 135             (inode->i_nlink > EXT4_LINK_MAX || inode->i_nlink == 2))
 136                 set_nlink(inode, 1);
 137  }
 138 +EXPORT_SYMBOL(ext4_inc_count);
 139
 140  /*
 141   * If a directory had nlink == 1, then we should let it be 1. This indicates
 142   * directory has >EXT4_LINK_MAX subdirs.
 143   */
 144 -static void ext4_dec_count(handle_t *handle, struct inode *inode)
 145 +void ext4_dec_count(handle_t *handle, struct inode *inode)
 146  {
 147         if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2)
 148                 drop_nlink(inode);
 149  }
 150 +EXPORT_SYMBOL(ext4_dec_count);
 151
 152
 153  static int ext4_add_nondir(handle_t *handle,
 154 Index: linux-4.15.0/fs/ext4/super.c
 155 ===================================================================
 156 --- linux-4.15.0.orig/fs/ext4/super.c
 157 +++ linux-4.15.0/fs/ext4/super.c
 158 @@ -5860,16 +5860,12 @@ static int __init ext4_init_fs(void)
 159         err = init_inodecache();
 160         if (err)
 161                 goto out1;
 162 -       register_as_ext3();
 163 -       register_as_ext2();
 164         err = register_filesystem(&ext4_fs_type);
 165         if (err)
 166                 goto out;
 167
 168         return 0;
 169  out:
 170 -       unregister_as_ext2();
 171 -       unregister_as_ext3();
 172         destroy_inodecache();
 173  out1:
 174         ext4_exit_mballoc();
 175 @@ -5888,8 +5884,6 @@ out5:
 176  static void __exit ext4_exit_fs(void)
 177  {
 178         ext4_destroy_lazyinit_thread();
 179 -       unregister_as_ext2();
 180 -       unregister_as_ext3();
 181         unregister_filesystem(&ext4_fs_type);
 182         destroy_inodecache();
 183         ext4_exit_mballoc();