revert-AKPM_MOUNT_flag.patch

   1 revert AKPM mount flag
   2
   3 Congratulations, we have done it! All bits in mount flags are used
   4 and only one is left. But we want two bits for TREE_ID and TRQUOTA
   5 mount options, so let's just hide this problem under a carpet now.
   6 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
   7 index 26d3cf8..3c4b0f5 100644
   8 --- a/fs/ext4/ext4.h
   9 +++ b/fs/ext4/ext4.h
  10 @@ -752,7 +752,6 @@ struct ext4_inode_info {
  11  #define EXT4_MOUNT_DELALLOC            0x8000000 /* Delalloc support */
  12  #define EXT4_MOUNT_DATA_ERR_ABORT      0x10000000 /* Abort on file data write */
  13  #define EXT4_MOUNT_BLOCK_VALIDITY      0x20000000 /* Block validity checking */
  14 -#define EXT4_MOUNT_AKPM_LOCK_HACK      0x40000000 /* akpm lock hack */
  15
  16  #define clear_opt(o, opt)              o &= ~EXT4_MOUNT_##opt
  17  #define set_opt(o, opt)                        o |= EXT4_MOUNT_##opt
  18 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
  19 index 7b55928..9df0d27 100644
  20 --- a/fs/ext4/super.c
  21 +++ b/fs/ext4/super.c
  22 @@ -884,8 +884,6 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
  23         }
  24         if (test_opt(sb, NOBH))
  25                 seq_puts(seq, ",nobh");
  26 -       if (test_opt(sb, AKPM_LOCK_HACK))
  27 -               seq_puts(seq, ",akpm_lock_hack");
  28         if (test_opt(sb, I_VERSION))
  29                 seq_puts(seq, ",i_version");
  30         if (!test_opt(sb, DELALLOC))
  31 @@ -1602,9 +1600,6 @@ set_qf_format:
  32                         else
  33                                 set_opt(sbi->s_mount_opt,NO_AUTO_DA_ALLOC);
  34                         break;
  35 -               case Opt_akpm_lock_hack:
  36 -                       set_opt(sbi->s_mount_opt, AKPM_LOCK_HACK);
  37 -                       break;
  38                 default:
  39                         ext4_msg(sb, KERN_ERR,
  40                                "Unrecognized mount option \"%s\" "
  41 @@ -3012,10 +3007,6 @@ static void ext4_init_journal_params(struct super_block *sb, journal_t *journal)
  42                 journal->j_flags |= JBD2_ABORT_ON_SYNCDATA_ERR;
  43         else
  44                 journal->j_flags &= ~JBD2_ABORT_ON_SYNCDATA_ERR;
  45 -       if (test_opt(sb, AKPM_LOCK_HACK))
  46 -               journal->j_flags |= JBD2_LOCK_HACK;
  47 -       else
  48 -               journal->j_flags &= ~JBD2_LOCK_HACK;
  49         spin_unlock(&journal->j_state_lock);
  50  }
  51