Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87f26807 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

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: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 85d21650

fs/ext4/super.c

+1 −11
Original line number Diff line number Diff line
@@ -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 */