diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-03-02 00:03:21 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-03-02 00:03:21 -0500 |
| commit | 87f26807e91102f2526d59c0232bf020479c8d0c (patch) | |
| tree | 26636cbfc0e606b4926e15fcbaeaf36b2a61308d | |
| parent | 85d216501a7c2aa3e19d71c70430395c864a2ee5 (diff) | |
| download | linux-stable-87f26807e91102f2526d59c0232bf020479c8d0c.tar.gz linux-stable-87f26807e91102f2526d59c0232bf020479c8d0c.tar.bz2 linux-stable-87f26807e91102f2526d59c0232bf020479c8d0c.zip | |
ext4: remove deprecation warnings for minix_df and grpid
People complained about removing both of these features, so per
Linus's dictate, we won't be able to remove them. Sigh...
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/super.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index deb6eb35ff3d..ed9a4b595c04 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1539,23 +1539,16 @@ static int parse_options(char *options, struct super_block *sb, token = match_token(p, tokens, args); switch (token) { case Opt_bsd_df: - ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38"); clear_opt(sb, MINIX_DF); break; case Opt_minix_df: - ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38"); set_opt(sb, MINIX_DF); - break; case Opt_grpid: - ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38"); set_opt(sb, GRPID); - break; case Opt_nogrpid: - ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38"); clear_opt(sb, GRPID); - break; case Opt_resuid: if (match_int(&args[0], &option)) @@ -3172,11 +3165,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) set_opt(sb, INIT_INODE_TABLE); if (def_mount_opts & EXT4_DEFM_DEBUG) set_opt(sb, DEBUG); - if (def_mount_opts & EXT4_DEFM_BSDGROUPS) { - ext4_msg(sb, KERN_WARNING, deprecated_msg, "bsdgroups", - "2.6.38"); + if (def_mount_opts & EXT4_DEFM_BSDGROUPS) set_opt(sb, GRPID); - } if (def_mount_opts & EXT4_DEFM_UID16) set_opt(sb, NO_UID32); /* xattr user namespace & acls are now defaulted on */ |