2 files changed, 73 insertions, 0 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index fc3eb79faa49..0e829cc8a18a 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -596,9 +596,80 @@ static inline void ext4_show_quota_options(struct seq_file *seq, struct super_bl
 #endif
 }
 
+/*
+ * Show an option if
+ *  - it's set to a non-default value OR
+ *  - if the per-sb default is different from the global default
+ */
 static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
 {
         struct super_block *sb = vfs->mnt_sb;
+        struct ext4_sb_info *sbi = EXT4_SB(sb);
+        struct ext4_super_block *es = sbi->s_es;
+        unsigned long def_mount_opts;
+
+        def_mount_opts = le32_to_cpu(es->s_default_mount_opts);
+
+        if (sbi->s_sb_block != 1)
+                seq_printf(seq, ",sb=%llu", sbi->s_sb_block);
+        if (test_opt(sb, MINIX_DF))
+                seq_puts(seq, ",minixdf");
+        if (test_opt(sb, GRPID))
+                seq_puts(seq, ",grpid");
+        if (!test_opt(sb, GRPID) && (def_mount_opts & EXT4_DEFM_BSDGROUPS))
+                seq_puts(seq, ",nogrpid");
+        if (sbi->s_resuid != EXT4_DEF_RESUID ||
+            le16_to_cpu(es->s_def_resuid) != EXT4_DEF_RESUID) {
+                seq_printf(seq, ",resuid=%u", sbi->s_resuid);
+        }
+        if (sbi->s_resgid != EXT4_DEF_RESGID ||
+            le16_to_cpu(es->s_def_resgid) != EXT4_DEF_RESGID) {
+                seq_printf(seq, ",resgid=%u", sbi->s_resgid);
+        }
+        if (test_opt(sb, ERRORS_CONT)) {
+                int def_errors = le16_to_cpu(es->s_errors);
+
+                if (def_errors == EXT4_ERRORS_PANIC ||
+                    def_errors == EXT4_ERRORS_RO) {
+                        seq_puts(seq, ",errors=continue");
+                }
+        }
+        if (test_opt(sb, ERRORS_RO))
+                seq_puts(seq, ",errors=remount-ro");
+        if (test_opt(sb, ERRORS_PANIC))
+                seq_puts(seq, ",errors=panic");
+        if (test_opt(sb, NO_UID32))
+                seq_puts(seq, ",nouid32");
+        if (test_opt(sb, DEBUG))
+                seq_puts(seq, ",debug");
+        if (test_opt(sb, OLDALLOC))
+                seq_puts(seq, ",oldalloc");
+#ifdef CONFIG_EXT4_FS_XATTR
+        if (test_opt(sb, XATTR_USER))
+                seq_puts(seq, ",user_xattr");
+        if (!test_opt(sb, XATTR_USER) &&
+            (def_mount_opts & EXT4_DEFM_XATTR_USER)) {
+                seq_puts(seq, ",nouser_xattr");
+        }
+#endif
+#ifdef CONFIG_EXT4_FS_POSIX_ACL
+        if (test_opt(sb, POSIX_ACL))
+                seq_puts(seq, ",acl");
+        if (!test_opt(sb, POSIX_ACL) && (def_mount_opts & EXT4_DEFM_ACL))
+                seq_puts(seq, ",noacl");
+#endif
+        if (!test_opt(sb, RESERVATION))
+                seq_puts(seq, ",noreservation");
+        if (sbi->s_commit_interval) {
+                seq_printf(seq, ",commit=%u",
+                           (unsigned) (sbi->s_commit_interval / HZ));
+        }
+        if (test_opt(sb, BARRIER))
+                seq_puts(seq, ",barrier=1");
+        if (test_opt(sb, NOBH))
+                seq_puts(seq, ",nobh");
+        if (!test_opt(sb, EXTENTS))
+                seq_puts(seq, ",noextents");
 
         if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)
                 seq_puts(seq, ",data=journal");
@@ -1486,6 +1557,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
         sbi->s_mount_opt = 0;
         sbi->s_resuid = EXT4_DEF_RESUID;
         sbi->s_resgid = EXT4_DEF_RESGID;
+        sbi->s_sb_block = sb_block;
 
         unlock_kernel();
 
diff --git a/include/linux/ext4_fs_sb.h b/include/linux/ext4_fs_sb.h
index 1b2ffee12be9..0a8e47d47c91 100644
--- a/include/linux/ext4_fs_sb.h
+++ b/include/linux/ext4_fs_sb.h
@@ -45,6 +45,7 @@ struct ext4_sb_info {
         struct ext4_super_block * s_es; /* Pointer to the super block in the buffer */
         struct buffer_head ** s_group_desc;
         unsigned long  s_mount_opt;
+        ext4_fsblk_t s_sb_block;
         uid_t s_resuid;
         gid_t s_resgid;
         unsigned short s_mount_state;