Commit a7a88b23 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

mempolicy: remove arg from mpol_parse_str, mpol_to_str 



Remove the unused argument (formerly no_context) from mpol_parse_str()
and from mpol_to_str().

Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2a07f40

fs/proc/task_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) 
	walk.mm = mm;



	pol = get_vma_policy(task, vma, vma->vm_start);

	mpol_to_str(buffer, sizeof(buffer), pol, 0);

	mpol_to_str(buffer, sizeof(buffer), pol);

	mpol_cond_put(pol);



	seq_printf(m, "%08lx %s", vma->vm_start, buffer);

include/linux/mempolicy.h

+4 −7
Original line number Diff line number Diff line
@@ -165,11 +165,10 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from, 




#ifdef CONFIG_TMPFS

extern int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context);

extern int mpol_parse_str(char *str, struct mempolicy **mpol);

#endif



extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,

			int no_context);

extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol);



/* Check if a vma is migratable */

static inline int vma_migratable(struct vm_area_struct *vma)
@@ -296,15 +295,13 @@ static inline void check_highest_zone(int k) 
}



#ifdef CONFIG_TMPFS

static inline int mpol_parse_str(char *str, struct mempolicy **mpol,

				int no_context)

static inline int mpol_parse_str(char *str, struct mempolicy **mpol)

{

	return 1;	/* error */

}

#endif



static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,

				int no_context)

static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol)

{

	return 0;

}

mm/mempolicy.c

+2 −4
Original line number Diff line number Diff line
@@ -2612,14 +2612,13 @@ static const char * const policy_modes[] = 
 * mpol_parse_str - parse string to mempolicy, for tmpfs mpol mount option.

 * @str:  string containing mempolicy to parse

 * @mpol:  pointer to struct mempolicy pointer, returned on success.

 * @unused:  redundant argument, to be removed later.

 *

 * Format of input:

 *	<mode>[=<flags>][:<nodelist>]

 *

 * On success, returns 0, else 1

 */

int mpol_parse_str(char *str, struct mempolicy **mpol, int unused)

int mpol_parse_str(char *str, struct mempolicy **mpol)

{

	struct mempolicy *new = NULL;

	unsigned short mode;
@@ -2747,13 +2746,12 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int unused) 
 * @buffer:  to contain formatted mempolicy string

 * @maxlen:  length of @buffer

 * @pol:  pointer to mempolicy to be formatted

 * @unused:  redundant argument, to be removed later.

 *

 * Convert a mempolicy into a string.

 * Returns the number of characters in buffer (if positive)

 * or an error (negative)

 */

int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int unused)

int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol)

{

	char *p = buffer;

	int l;

mm/shmem.c

+2 −2
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol) 
	if (!mpol || mpol->mode == MPOL_DEFAULT)

		return;		/* show nothing */



	mpol_to_str(buffer, sizeof(buffer), mpol, 1);

	mpol_to_str(buffer, sizeof(buffer), mpol);



	seq_printf(seq, ",mpol=%s", buffer);

}
@@ -2463,7 +2463,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo, 
			if (!gid_valid(sbinfo->gid))

				goto bad_val;

		} else if (!strcmp(this_char,"mpol")) {

			if (mpol_parse_str(value, &sbinfo->mpol, 1))

			if (mpol_parse_str(value, &sbinfo->mpol))

				goto bad_val;

		} else {

			printk(KERN_ERR "tmpfs: Bad mount option %s\n",