tmpfs: cleanup mpol_parse_str() (926f2ae0) · Commits · 戴 / test

mm/mempolicy.c

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -2195,8 +2195,8 @@ int mpol_parse_str(char str, struct mempolicy *mpol, int no_context)
	char *rest = nodelist;		char *rest = nodelist;
	while (isdigit(*rest))		while (isdigit(*rest))
	rest++;		rest++;
	if (!*rest)		if (*rest)
	err = 0;		goto out;
	}		}
	break;		break;
	case MPOL_INTERLEAVE:		case MPOL_INTERLEAVE:
	@@ -2205,7 +2205,6 @@ int mpol_parse_str(char str, struct mempolicy *mpol, int no_context)
	*/		*/
	if (!nodelist)		if (!nodelist)
	nodes = node_states[N_HIGH_MEMORY];		nodes = node_states[N_HIGH_MEMORY];
	err = 0;
	break;		break;
	case MPOL_LOCAL:		case MPOL_LOCAL:
	/*		/*
	@@ -2214,7 +2213,6 @@ int mpol_parse_str(char str, struct mempolicy *mpol, int no_context)
	if (nodelist)		if (nodelist)
	goto out;		goto out;
	mode = MPOL_PREFERRED;		mode = MPOL_PREFERRED;
	err = 0;
	break;		break;
	case MPOL_DEFAULT:		case MPOL_DEFAULT:
	/*		/*
	@@ -2229,7 +2227,6 @@ int mpol_parse_str(char str, struct mempolicy *mpol, int no_context)
	*/		*/
	if (!nodelist)		if (!nodelist)
	goto out;		goto out;
	err = 0;
	}		}

	mode_flags = 0;		mode_flags = 0;
	@@ -2243,13 +2240,14 @@ int mpol_parse_str(char str, struct mempolicy *mpol, int no_context)
	else if (!strcmp(flags, "relative"))		else if (!strcmp(flags, "relative"))
	mode_flags \|= MPOL_F_RELATIVE_NODES;		mode_flags \|= MPOL_F_RELATIVE_NODES;
	else		else
	err = 1;		goto out;
	}		}

	new = mpol_new(mode, mode_flags, &nodes);		new = mpol_new(mode, mode_flags, &nodes);
	if (IS_ERR(new))		if (IS_ERR(new))
	err = 1;		goto out;
	else {
			{
	int ret;		int ret;
	NODEMASK_SCRATCH(scratch);		NODEMASK_SCRATCH(scratch);
	if (scratch) {		if (scratch) {
	@@ -2260,13 +2258,15 @@ int mpol_parse_str(char str, struct mempolicy *mpol, int no_context)
	ret = -ENOMEM;		ret = -ENOMEM;
	NODEMASK_SCRATCH_FREE(scratch);		NODEMASK_SCRATCH_FREE(scratch);
	if (ret) {		if (ret) {
	err = 1;
	mpol_put(new);		mpol_put(new);
	} else if (no_context) {		goto out;
			}
			}
			err = 0;
			if (no_context) {
	/* save for contextualization */		/* save for contextualization */
	new->w.user_nodemask = nodes;		new->w.user_nodemask = nodes;
	}		}
	}

	out:		out:
	/* Restore string for error message */		/* Restore string for error message */

Admin message