summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2005-07-12 13:58:28 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 16:01:01 -0700
commit08c6a96fd77836856c090ebb39beadc81cb8484d (patch)
tree36e643a41179078abcb8a866894586cba9bbf7e0 /include/linux
parent5323125031799a7fd8602ce150c3902aedfdcba6 (diff)
downloadlinux-3.10-08c6a96fd77836856c090ebb39beadc81cb8484d.tar.gz
linux-3.10-08c6a96fd77836856c090ebb39beadc81cb8484d.tar.bz2
linux-3.10-08c6a96fd77836856c090ebb39beadc81cb8484d.zip
[PATCH] ext3: fix options parsing
Fix a problem with ext3 mount option parsing. When remount of a filesystem fails, old options are now restored. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ext3_fs.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 4b6e1ab216a..c16662836c5 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -239,6 +239,20 @@ struct ext3_new_group_data {
#define EXT3_IOC_SETRSVSZ _IOW('f', 6, long)
/*
+ * Mount options
+ */
+struct ext3_mount_options {
+ unsigned long s_mount_opt;
+ uid_t s_resuid;
+ gid_t s_resgid;
+ unsigned long s_commit_interval;
+#ifdef CONFIG_QUOTA
+ int s_jquota_fmt;
+ char *s_qf_names[MAXQUOTAS];
+#endif
+};
+
+/*
* Structure of an inode on the disk
*/
struct ext3_inode {