diff options
author | Dmitry Monakhov <dmonakhov@openvz.org> | 2010-03-01 22:29:21 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-03-01 22:29:21 -0500 |
commit | 437ca0fda3b442dff9e591581b5e1ffdfec24660 (patch) | |
tree | 863f6e2d47abf48ce6513cb860a8fda0166b7edb | |
parent | cc483f102c3f703e853c96f95a654f0106fb2603 (diff) |
ext4: deprecate obsoleted mount options
Declare following list of mount options as deprecated:
- bsddf, miniddf
- grpid, bsdgroups, nogrpid, sysvgroups
Declare following list of default mount options as deprecated:
- bsdgroups
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r-- | fs/ext4/super.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 79937e921988..c832508d5515 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1205,6 +1205,8 @@ static ext4_fsblk_t get_sb_block(void **data) | |||
1205 | } | 1205 | } |
1206 | 1206 | ||
1207 | #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3)) | 1207 | #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3)) |
1208 | static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n" | ||
1209 | "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n"; | ||
1208 | 1210 | ||
1209 | #ifdef CONFIG_QUOTA | 1211 | #ifdef CONFIG_QUOTA |
1210 | static int set_qf_name(struct super_block *sb, int qtype, substring_t *args) | 1212 | static int set_qf_name(struct super_block *sb, int qtype, substring_t *args) |
@@ -1294,16 +1296,23 @@ static int parse_options(char *options, struct super_block *sb, | |||
1294 | token = match_token(p, tokens, args); | 1296 | token = match_token(p, tokens, args); |
1295 | switch (token) { | 1297 | switch (token) { |
1296 | case Opt_bsd_df: | 1298 | case Opt_bsd_df: |
1299 | ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38"); | ||
1297 | clear_opt(sbi->s_mount_opt, MINIX_DF); | 1300 | clear_opt(sbi->s_mount_opt, MINIX_DF); |
1298 | break; | 1301 | break; |
1299 | case Opt_minix_df: | 1302 | case Opt_minix_df: |
1303 | ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38"); | ||
1300 | set_opt(sbi->s_mount_opt, MINIX_DF); | 1304 | set_opt(sbi->s_mount_opt, MINIX_DF); |
1305 | |||
1301 | break; | 1306 | break; |
1302 | case Opt_grpid: | 1307 | case Opt_grpid: |
1308 | ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38"); | ||
1303 | set_opt(sbi->s_mount_opt, GRPID); | 1309 | set_opt(sbi->s_mount_opt, GRPID); |
1310 | |||
1304 | break; | 1311 | break; |
1305 | case Opt_nogrpid: | 1312 | case Opt_nogrpid: |
1313 | ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38"); | ||
1306 | clear_opt(sbi->s_mount_opt, GRPID); | 1314 | clear_opt(sbi->s_mount_opt, GRPID); |
1315 | |||
1307 | break; | 1316 | break; |
1308 | case Opt_resuid: | 1317 | case Opt_resuid: |
1309 | if (match_int(&args[0], &option)) | 1318 | if (match_int(&args[0], &option)) |
@@ -2449,8 +2458,11 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
2449 | def_mount_opts = le32_to_cpu(es->s_default_mount_opts); | 2458 | def_mount_opts = le32_to_cpu(es->s_default_mount_opts); |
2450 | if (def_mount_opts & EXT4_DEFM_DEBUG) | 2459 | if (def_mount_opts & EXT4_DEFM_DEBUG) |
2451 | set_opt(sbi->s_mount_opt, DEBUG); | 2460 | set_opt(sbi->s_mount_opt, DEBUG); |
2452 | if (def_mount_opts & EXT4_DEFM_BSDGROUPS) | 2461 | if (def_mount_opts & EXT4_DEFM_BSDGROUPS) { |
2462 | ext4_msg(sb, KERN_WARNING, deprecated_msg, "bsdgroups", | ||
2463 | "2.6.38"); | ||
2453 | set_opt(sbi->s_mount_opt, GRPID); | 2464 | set_opt(sbi->s_mount_opt, GRPID); |
2465 | } | ||
2454 | if (def_mount_opts & EXT4_DEFM_UID16) | 2466 | if (def_mount_opts & EXT4_DEFM_UID16) |
2455 | set_opt(sbi->s_mount_opt, NO_UID32); | 2467 | set_opt(sbi->s_mount_opt, NO_UID32); |
2456 | #ifdef CONFIG_EXT4_FS_XATTR | 2468 | #ifdef CONFIG_EXT4_FS_XATTR |