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

   1 commit b175e2441b0cd9fae60341ba92b0f7f192e71446
   2 Author: girish <girish>
   3
   4 b=16893
   5 i=adilger
   6 i=johann
   7
   8 ext4 ldiskfs patches for rhel5
   9
  10 ---
  11  fs/ext4/ext4.h   | 25 ++++++++++++++++++++++++-
  12  fs/ext4/ialloc.c |  3 ++-
  13  fs/ext4/inode.c  | 16 ++++++++++++++++
  14  fs/ext4/namei.c  |  9 ++++++---
  15  fs/ext4/super.c  | 10 ++--------
  16  fs/ext4/xattr.c  |  2 ++
  17  6 files changed, 52 insertions(+), 13 deletions(-)
  18
  19 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
  20 index 8d2c493..c96d89f 100644
  21 --- a/fs/ext4/ext4.h
  22 +++ b/fs/ext4/ext4.h
  23 @@ -2152,7 +2154,21 @@ static inline bool ext4_has_unknown_ext##ver##_incompat_features(struct super_bl
  24
  25  EXTN_FEATURE_FUNCS(2)
  26  EXTN_FEATURE_FUNCS(3)
  27 -EXTN_FEATURE_FUNCS(4)
  28 +static inline bool ext4_has_unknown_ext4_compat_features(struct super_block *sb)
  29 +{
  30 +       return ((EXT4_SB(sb)->s_es->s_feature_compat &
  31 +               cpu_to_le32(~EXT4_FEATURE_COMPAT_SUPP)) != 0);
  32 +}
  33 +static inline bool ext4_has_unknown_ext4_ro_compat_features(struct super_block *sb)
  34 +{
  35 +       return ((EXT4_SB(sb)->s_es->s_feature_ro_compat &
  36 +               cpu_to_le32(~EXT4_FEATURE_RO_COMPAT_SUPP)) != 0);
  37 +}
  38 +static inline bool ext4_has_unknown_ext4_incompat_features(struct super_block *sb)
  39 +{
  40 +       return ((EXT4_SB(sb)->s_es->s_feature_incompat &
  41 +               cpu_to_le32(~EXT4_FEATURE_INCOMPAT_SUPP)) != 0);
  42 +}
  43
  44  static inline bool ext4_has_compat_features(struct super_block *sb)
  45  {
  46 @@ -3687,6 +3703,13 @@ struct ext4_extent;
  47  #define EXT_MAX_BLOCKS 0xffffffff
  48
  49  extern void ext4_ext_tree_init(handle_t *handle, struct inode *inode);
  50 +extern struct buffer_head *ext4_read_inode_bitmap(struct super_block *sb,
  51 +                                                 ext4_group_t block_group);
  52 +extern void ext4_inc_count(struct inode *inode);
  53 +extern void ext4_dec_count(struct inode *inode);
  54 +extern struct buffer_head *ext4_append(handle_t *handle,
  55 +                                      struct inode *inode,
  56 +                                      ext4_lblk_t *block);
  57  extern int ext4_ext_index_trans_blocks(struct inode *inode, int extents);
  58  extern int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
  59                                struct ext4_map_blocks *map, int flags);
  60 diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
  61 index 5d0a11d..4840190 100644
  62 --- a/fs/ext4/ialloc.c
  63 +++ b/fs/ext4/ialloc.c
  64 @@ -120,7 +120,7 @@ verified:
  65   *
  66   * Return buffer_head of bitmap on success, or an ERR_PTR on error.
  67   */
  68 -static struct buffer_head *
  69 +struct buffer_head *
  70  ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
  71  {
  72         struct ext4_group_desc *desc;
  73 @@ -215,6 +215,7 @@ out:
  74         put_bh(bh);
  75         return ERR_PTR(err);
  76  }
  77 +EXPORT_SYMBOL(ext4_read_inode_bitmap);
  78
  79  /*
  80   * NOTE! When we get the inode, we're the only people
  81 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
  82 index 06ee22e..bb109d9 100644
  83 --- a/fs/ext4/inode.c
  84 +++ b/fs/ext4/inode.c
  85 @@ -6204,3 +6204,20 @@ out_error:
  86         ext4_journal_stop(handle);
  87         goto out;
  88  }
  89 +EXPORT_SYMBOL(ext4_map_blocks);
  90 +EXPORT_SYMBOL(ext4_truncate);
  91 +EXPORT_SYMBOL(ext4_iget);
  92 +EXPORT_SYMBOL(ext4_bread);
  93 +EXPORT_SYMBOL(ext4_itable_unused_count);
  94 +EXPORT_SYMBOL(ext4_force_commit);
  95 +EXPORT_SYMBOL(__ext4_mark_inode_dirty);
  96 +EXPORT_SYMBOL(ext4_get_group_desc);
  97 +EXPORT_SYMBOL(__ext4_journal_get_write_access);
  98 +EXPORT_SYMBOL(__ext4_journal_start_sb);
  99 +EXPORT_SYMBOL(__ext4_journal_stop);
 100 +EXPORT_SYMBOL(__ext4_handle_dirty_metadata);
 101 +EXPORT_SYMBOL(__ext4_std_error);
 102 +EXPORT_SYMBOL(ext4fs_dirhash);
 103 +EXPORT_SYMBOL(ext4_get_inode_loc);
 104 +EXPORT_SYMBOL(__ext4_journal_ensure_credits);
 105 +EXPORT_SYMBOL(ext4_chunk_trans_blocks);
 106 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
 107 index 0d5b8ea..f207dd5 100644
 108 --- a/fs/ext4/namei.c
 109 +++ b/fs/ext4/namei.c
 110 @@ -50,7 +50,7 @@
 111  #define NAMEI_RA_BLOCKS  4
 112  #define NAMEI_RA_SIZE       (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
 113
 114 -static struct buffer_head *ext4_append(handle_t *handle,
 115 +struct buffer_head *ext4_append(handle_t *handle,
 116                                         struct inode *inode,
 117                                         ext4_lblk_t *block)
 118  {
 119 @@ -205,6 +205,7 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,
 120         }
 121         return bh;
 122  }
 123 +EXPORT_SYMBOL(ext4_append);
 124
 125  #ifdef DX_DEBUG
 126  #define dxtrace(command) command
 127 @@ -2753,23 +2754,25 @@ EXPORT_SYMBOL(ext4_delete_entry);
 128   * for checking S_ISDIR(inode) (since the INODE_INDEX feature will not be set
 129   * on regular files) and to avoid creating huge/slow non-HTREE directories.
 130   */
 131 -static void ext4_inc_count(struct inode *inode)
 132 +void ext4_inc_count(struct inode *inode)
 133  {
 134         inc_nlink(inode);
 135         if (is_dx(inode) &&
 136             (inode->i_nlink > EXT4_LINK_MAX || inode->i_nlink == 2))
 137                 set_nlink(inode, 1);
 138  }
 139 +EXPORT_SYMBOL(ext4_inc_count);
 140
 141  /*
 142   * If a directory had nlink == 1, then we should let it be 1. This indicates
 143   * directory has >EXT4_LINK_MAX subdirs.
 144   */
 145 -static void ext4_dec_count(struct inode *inode)
 146 +void ext4_dec_count(struct inode *inode)
 147  {
 148         if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2)
 149                 drop_nlink(inode);
 150  }
 151 +EXPORT_SYMBOL(ext4_dec_count);
 152
 153
 154  /*
 155 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
 156 index 7b5df25..4be1994 100644
 157 --- a/fs/ext4/super.c
 158 +++ b/fs/ext4/super.c
 159 @@ -5605,7 +5605,7 @@ static void ext4_update_super(struct super_block *sb)
 160                         __ext4_update_tstamp(&es->s_first_error_time,
 161                                              &es->s_first_error_time_hi,
 162                                              sbi->s_first_error_time);
 163 -                       strncpy(es->s_first_error_func, sbi->s_first_error_func,
 164 +                       strlcpy(es->s_first_error_func, sbi->s_first_error_func,
 165                                 sizeof(es->s_first_error_func));
 166                         es->s_first_error_line =
 167                                 cpu_to_le32(sbi->s_first_error_line);
 168 @@ -5619,7 +5619,7 @@ static void ext4_update_super(struct super_block *sb)
 169                 __ext4_update_tstamp(&es->s_last_error_time,
 170                                      &es->s_last_error_time_hi,
 171                                      sbi->s_last_error_time);
 172 -               strncpy(es->s_last_error_func, sbi->s_last_error_func,
 173 +               strlcpy(es->s_last_error_func, sbi->s_last_error_func,
 174                         sizeof(es->s_last_error_func));
 175                 es->s_last_error_line = cpu_to_le32(sbi->s_last_error_line);
 176                 es->s_last_error_ino = cpu_to_le32(sbi->s_last_error_ino);
 177 @@ -6826,16 +6826,12 @@ static int __init ext4_init_fs(void)
 178         if (err)
 179                 goto out05;
 180
 181 -       register_as_ext3();
 182 -       register_as_ext2();
 183         err = register_filesystem(&ext4_fs_type);
 184         if (err)
 185                 goto out;
 186
 187         return 0;
 188  out:
 189 -       unregister_as_ext2();
 190 -       unregister_as_ext3();
 191         ext4_fc_destroy_dentry_cache();
 192  out05:
 193         destroy_inodecache();
 194 @@ -6860,8 +6856,6 @@ out7:
 195  static void __exit ext4_exit_fs(void)
 196  {
 197         ext4_destroy_lazyinit_thread();
 198 -       unregister_as_ext2();
 199 -       unregister_as_ext3();
 200         unregister_filesystem(&ext4_fs_type);
 201         ext4_fc_destroy_dentry_cache();
 202         destroy_inodecache();
 203 diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
 204 index f9b4602..f5af950 100644
 205 --- a/fs/ext4/xattr.c
 206 +++ b/fs/ext4/xattr.c
 207 @@ -671,6 +671,7 @@ ext4_xattr_get(struct inode *inode, int name_index, const char *name,
 208         up_read(&EXT4_I(inode)->xattr_sem);
 209         return error;
 210  }
 211 +EXPORT_SYMBOL(ext4_xattr_get);
 212
 213  static int
 214  ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
 215 @@ -2430,6 +2431,7 @@ cleanup:
 216         ext4_write_unlock_xattr(inode, &no_expand);
 217         return error;
 218  }
 219 +EXPORT_SYMBOL(ext4_xattr_set_handle);
 220
 221  int ext4_xattr_set_credits(struct inode *inode, size_t value_len,
 222                            bool is_create, int *credits)
 223 --
 224 2.34.1
 225