ext4: remove the journal=update mount option

The V2 journal format was introduced around ten years ago,
for ext3. It seems highly unlikely that anyone will need this
migration option for ext4.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

1 files changed, 1 insertions, 25 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3e697ec7feca..9420c50c5c6a 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1336,8 +1336,7 @@ enum {
         Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl,
         Opt_auto_da_alloc, Opt_noauto_da_alloc, Opt_noload, Opt_nobh, Opt_bh,
         Opt_commit, Opt_min_batch_time, Opt_max_batch_time,
-        Opt_journal_update, Opt_journal_dev,
-        Opt_journal_checksum, Opt_journal_async_commit,
+        Opt_journal_dev, Opt_journal_checksum, Opt_journal_async_commit,
         Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
         Opt_data_err_abort, Opt_data_err_ignore,
         Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
@@ -1379,7 +1378,6 @@ static const match_table_t tokens = {
         {Opt_commit, "commit=%u"},
         {Opt_min_batch_time, "min_batch_time=%u"},
         {Opt_max_batch_time, "max_batch_time=%u"},
-        {Opt_journal_update, "journal=update"},
         {Opt_journal_dev, "journal_dev=%u"},
         {Opt_journal_checksum, "journal_checksum"},
         {Opt_journal_async_commit, "journal_async_commit"},
@@ -1629,19 +1627,6 @@ static int parse_options(char *options, struct super_block *sb,
                         ext4_msg(sb, KERN_ERR, "(no)acl options not supported");
                         break;
 #endif
-                case Opt_journal_update:
-                        /* @@@ FIXME */
-                        /* Eventually we will want to be able to create
-                           a journal file here.  For now, only allow the
-                           user to specify an existing inode to be the
-                           journal file. */
-                        if (is_remount) {
-                                ext4_msg(sb, KERN_ERR,
-                                         "Cannot specify journal on remount");
-                                return 0;
-                        }
-                        set_opt(sb, UPDATE_JOURNAL);
-                        break;
                 case Opt_journal_dev:
                         if (is_remount) {
                                 ext4_msg(sb, KERN_ERR,
@@ -4109,15 +4094,6 @@ static int ext4_load_journal(struct super_block *sb,
         if (!(journal->j_flags & JBD2_BARRIER))
                 ext4_msg(sb, KERN_INFO, "barriers disabled");
 
-        if (!really_read_only && test_opt(sb, UPDATE_JOURNAL)) {
-                err = jbd2_journal_update_format(journal);
-                if (err)  {
-                        ext4_msg(sb, KERN_ERR, "error updating journal");
-                        jbd2_journal_destroy(journal);
-                        return err;
-                }
-        }
-
         if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER))
                 err = jbd2_journal_wipe(journal, !really_read_only);
         if (!err) {