From 27d44f8ac8c6e6e40990e0fab2110784517e4cd2 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 15 Dec 2010 20:28:48 -0500
Subject: [PATCH] --- yaml --- r: 229096 b: refs/heads/master c:
 673c610033a8202c037ecd068c7a235495acda17 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/ext4/ext4.h  | 16 ----------------
 trunk/fs/ext4/super.c | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 27e51f83b2e9..e1639a38beea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd8c37eccdda21153298997417144b38b1623196
+refs/heads/master: 673c610033a8202c037ecd068c7a235495acda17
diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h
index 2d93620d092e..ddae3c435138 100644
--- a/trunk/fs/ext4/ext4.h
+++ b/trunk/fs/ext4/ext4.h
@@ -561,22 +561,6 @@ struct ext4_new_group_data {
 #define EXT4_IOC32_SETVERSION_OLD	FS_IOC32_SETVERSION
 #endif
 
-
-/*
- *  Mount options
- */
-struct ext4_mount_options {
-	unsigned long s_mount_opt;
-	uid_t s_resuid;
-	gid_t s_resgid;
-	unsigned long s_commit_interval;
-	u32 s_min_batch_time, s_max_batch_time;
-#ifdef CONFIG_QUOTA
-	int s_jquota_fmt;
-	char *s_qf_names[MAXQUOTAS];
-#endif
-};
-
 /* Max physical block we can addres w/o extents */
 #define EXT4_MAX_BLOCK_FILE_PHYS	0xFFFFFFFF
 
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index cf7d9131d785..7aa3a790363a 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -4166,6 +4166,21 @@ static int ext4_unfreeze(struct super_block *sb)
 	return 0;
 }
 
+/*
+ * Structure to save mount options for ext4_remount's benefit
+ */
+struct ext4_mount_options {
+	unsigned long s_mount_opt;
+	uid_t s_resuid;
+	gid_t s_resgid;
+	unsigned long s_commit_interval;
+	u32 s_min_batch_time, s_max_batch_time;
+#ifdef CONFIG_QUOTA
+	int s_jquota_fmt;
+	char *s_qf_names[MAXQUOTAS];
+#endif
+};
+
 static int ext4_remount(struct super_block *sb, int *flags, char *data)
 {
 	struct ext4_super_block *es;