ext4_add_update_incompat_feature.patch

   1 ext4: Introduce ext4_update_*_feature
   2
   3 From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
   4
   5 Introduce ext4_update_*_feature and use them instead
   6 of opencoding.
   7
   8
   9 Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
  10 ---
  11
  12  fs/ext4/ialloc.c        |   11 +++------
  13  fs/ext4/super.c         |   60 +++++++++++++++++++++++++++++++++++++++++++++++
  14  include/linux/ext4_fs.h |    6 +++++
  15  3 files changed, 70 insertions(+), 7 deletions(-)
  16
  17
  18 diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
  19 index 7b5cfa6..00b152b 100644
  20 --- a/fs/ext4/ialloc.c
  21 +++ b/fs/ext4/ialloc.c
  22 @@ -748,13 +748,10 @@ got:
  23         if (test_opt(sb, EXTENTS)) {
  24                 EXT4_I(inode)->i_flags |= EXT4_EXTENTS_FL;
  25                 ext4_ext_tree_init(handle, inode);
  26 -               if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)) {
  27 -                       err = ext4_journal_get_write_access(handle, EXT4_SB(sb)->s_sbh);
  28 -                       if (err) goto fail;
  29 -                       EXT4_SET_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS);
  30 -                       BUFFER_TRACE(EXT4_SB(sb)->s_sbh, "call ext4_journal_dirty_metadata");
  31 -                       err = ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh);
  32 -               }
  33 +               err = ext4_update_incompat_feature(handle, sb,
  34 +                                               EXT4_FEATURE_INCOMPAT_EXTENTS);
  35 +               if (err)
  36 +                       goto fail;
  37         }
  38
  39         ext4_debug("allocating inode %lu\n", inode->i_ino);
  40 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
  41 index df8842b..4d7f33f 100644
  42 --- a/fs/ext4/super.c
  43 +++ b/fs/ext4/super.c
  44 @@ -373,6 +373,66 @@ void ext4_update_dynamic_rev(struct super_block *sb)
  45          */
  46  }
  47
  48 +int ext4_update_compat_feature(handle_t *handle,
  49 +                                       struct super_block *sb, __u32 compat)
  50 +{
  51 +       int err = 0;
  52 +       if (!EXT4_HAS_COMPAT_FEATURE(sb, compat)) {
  53 +               err = ext4_journal_get_write_access(handle,
  54 +                               EXT4_SB(sb)->s_sbh);
  55 +               if (err)
  56 +                       return err;
  57 +               EXT4_SET_COMPAT_FEATURE(sb, compat);
  58 +               sb->s_dirt = 1;
  59 +               handle->h_sync = 1;
  60 +               BUFFER_TRACE(EXT4_SB(sb)->s_sbh,
  61 +                                       "call ext4_journal_dirty_met adata");
  62 +               err = ext4_journal_dirty_metadata(handle,
  63 +                               EXT4_SB(sb)->s_sbh);
  64 +       }
  65 +       return err;
  66 +}
  67 +
  68 +int ext4_update_rocompat_feature(handle_t *handle,
  69 +                                       struct super_block *sb, __u32 rocompat)
  70 +{
  71 +       int err = 0;
  72 +       if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, rocompat)) {
  73 +               err = ext4_journal_get_write_access(handle,
  74 +                               EXT4_SB(sb)->s_sbh);
  75 +               if (err)
  76 +                       return err;
  77 +               EXT4_SET_RO_COMPAT_FEATURE(sb, rocompat);
  78 +               sb->s_dirt = 1;
  79 +               handle->h_sync = 1;
  80 +               BUFFER_TRACE(EXT4_SB(sb)->s_sbh,
  81 +                                       "call ext4_journal_dirty_met adata");
  82 +               err = ext4_journal_dirty_metadata(handle,
  83 +                               EXT4_SB(sb)->s_sbh);
  84 +       }
  85 +       return err;
  86 +}
  87 +
  88 +int ext4_update_incompat_feature(handle_t *handle,
  89 +                                       struct super_block *sb, __u32 incompat)
  90 +{
  91 +       int err = 0;
  92 +       if (!EXT4_HAS_INCOMPAT_FEATURE(sb, incompat)) {
  93 +               err = ext4_journal_get_write_access(handle,
  94 +                               EXT4_SB(sb)->s_sbh);
  95 +               if (err)
  96 +                       return err;
  97 +               EXT4_SET_INCOMPAT_FEATURE(sb, incompat);
  98 +               sb->s_dirt = 1;
  99 +               handle->h_sync = 1;
 100 +               BUFFER_TRACE(EXT4_SB(sb)->s_sbh,
 101 +                                       "call ext4_journal_dirty_met adata");
 102 +               err = ext4_journal_dirty_metadata(handle,
 103 +                               EXT4_SB(sb)->s_sbh);
 104 +       }
 105 +       return err;
 106 +}
 107 +
 108  /*
 109   * Open the external journal device
 110   */
 111 diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
 112 index e1103c2..429dbfc 100644
 113 --- a/include/linux/ext4_fs.h
 114 +++ b/include/linux/ext4_fs.h
 115 @@ -989,6 +989,12 @@ extern void ext4_abort (struct super_block *, const char *, const char *, ...)
 116  extern void ext4_warning (struct super_block *, const char *, const char *, ...)
 117         __attribute__ ((format (printf, 3, 4)));
 118  extern void ext4_update_dynamic_rev (struct super_block *sb);
 119 +extern int ext4_update_compat_feature(handle_t *handle, struct super_block *sb,
 120 +                                       __u32 compat);
 121 +extern int ext4_update_rocompat_feature(handle_t *handle,
 122 +                                       struct super_block *sb, __u32 rocompat);
 123 +extern int ext4_update_incompat_feature(handle_t *handle,
 124 +                                       struct super_block *sb, __u32 incompat);
 125  extern ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
 126                                       struct ext4_group_desc *bg);
 127  extern ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,