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

Commit 3eb5bdf0 authored by Norton.Zhu's avatar Norton.Zhu Committed by Linus Torvalds
Browse files

ocfs2: optimize bad declarations and redundant assignment 



In ocfs2_parse_options,

a) it's better to declare variables(small size) outside of while loop;

b) 'option' will be set by match_int, 'option = 0;' makes no sense, if
   match_int failed, it just goto bail and return.

Signed-off-by: default avatarNorton.Zhu <norton.zhu@huawei.com>
Reviewed-by: default avatarJoseph Qi <joseph.qi@huawei.com>
Cc: Gang He <ghe@suse.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Acked-by: default avatarJoel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2886357b

fs/ocfs2/super.c

+2 −6
Original line number Diff line number Diff line
@@ -1280,6 +1280,8 @@ static int ocfs2_parse_options(struct super_block *sb, 
	int status, user_stack = 0;

	char *p;

	u32 tmp;

	int token, option;

	substring_t args[MAX_OPT_ARGS];



	trace_ocfs2_parse_options(is_remount, options ? options : "(none)");
@@ -1298,9 +1300,6 @@ static int ocfs2_parse_options(struct super_block *sb, 
	}



	while ((p = strsep(&options, ",")) != NULL) {

		int token, option;

		substring_t args[MAX_OPT_ARGS];



		if (!*p)

			continue;
@@ -1367,7 +1366,6 @@ static int ocfs2_parse_options(struct super_block *sb, 
				mopt->atime_quantum = option;

			break;

		case Opt_slot:

			option = 0;

			if (match_int(&args[0], &option)) {

				status = 0;

				goto bail;
@@ -1376,7 +1374,6 @@ static int ocfs2_parse_options(struct super_block *sb, 
				mopt->slot = (s16)option;

			break;

		case Opt_commit:

			option = 0;

			if (match_int(&args[0], &option)) {

				status = 0;

				goto bail;
@@ -1388,7 +1385,6 @@ static int ocfs2_parse_options(struct super_block *sb, 
			mopt->commit_interval = HZ * option;

			break;

		case Opt_localalloc:

			option = 0;

			if (match_int(&args[0], &option)) {

				status = 0;

				goto bail;