dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Hugh Dickins <hughd@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Hugh Dickins 2013-01-02 02:04:23 -08:00 committed by Linus Torvalds
parent f2a07f40db
commit a7a88b2373
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/proc/task_mmu.c
View File

@ -1278,7 +1278,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
walk.mm = mm; walk.mm = mm;
pol = get_vma_policy(task, vma, vma->vm_start); 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); mpol_cond_put(pol);
seq_printf(m, "%08lx %s", vma->vm_start, buffer); seq_printf(m, "%08lx %s", vma->vm_start, buffer);

11
include/linux/mempolicy.h
View File

@ -165,11 +165,10 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
#ifdef CONFIG_TMPFS #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 #endif
extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol);
int no_context);
/* Check if a vma is migratable */ /* Check if a vma is migratable */
static inline int vma_migratable(struct vm_area_struct *vma) 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 #ifdef CONFIG_TMPFS
static inline int mpol_parse_str(char *str, struct mempolicy **mpol, static inline int mpol_parse_str(char *str, struct mempolicy **mpol)
int no_context)
{ {
return 1; /* error */ return 1; /* error */
} }
#endif #endif
static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol)
int no_context)
{ {
return 0; return 0;
} }

6
mm/mempolicy.c
View File

@ -2612,14 +2612,13 @@ static const char * const policy_modes[] =
* mpol_parse_str - parse string to mempolicy, for tmpfs mpol mount option. * mpol_parse_str - parse string to mempolicy, for tmpfs mpol mount option.
* @str: string containing mempolicy to parse * @str: string containing mempolicy to parse
* @mpol: pointer to struct mempolicy pointer, returned on success. * @mpol: pointer to struct mempolicy pointer, returned on success.
* @unused: redundant argument, to be removed later.
* *
* Format of input: * Format of input:
* <mode>[=<flags>][:<nodelist>] * <mode>[=<flags>][:<nodelist>]
* *
* On success, returns 0, else 1 * 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; struct mempolicy *new = NULL;
unsigned short mode; unsigned short mode;
@ -2747,13 +2746,12 @@ out:
* @buffer: to contain formatted mempolicy string * @buffer: to contain formatted mempolicy string
* @maxlen: length of @buffer * @maxlen: length of @buffer
* @pol: pointer to mempolicy to be formatted * @pol: pointer to mempolicy to be formatted
* @unused: redundant argument, to be removed later.
* *
* Convert a mempolicy into a string. * Convert a mempolicy into a string.
* Returns the number of characters in buffer (if positive) * Returns the number of characters in buffer (if positive)
* or an error (negative) * 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; char *p = buffer;
int l; int l;

4
mm/shmem.c
View File

@ -889,7 +889,7 @@ static void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol)
if (!mpol || mpol->mode == MPOL_DEFAULT) if (!mpol || mpol->mode == MPOL_DEFAULT)
return; /* show nothing */ return; /* show nothing */
mpol_to_str(buffer, sizeof(buffer), mpol, 1); mpol_to_str(buffer, sizeof(buffer), mpol);
seq_printf(seq, ",mpol=%s", buffer); 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)) if (!gid_valid(sbinfo->gid))
goto bad_val; goto bad_val;
} else if (!strcmp(this_char,"mpol")) { } else if (!strcmp(this_char,"mpol")) {
if (mpol_parse_str(value, &sbinfo->mpol, 1)) if (mpol_parse_str(value, &sbinfo->mpol))
goto bad_val; goto bad_val;
} else { } else {
printk(KERN_ERR "tmpfs: Bad mount option %s\n", printk(KERN_ERR "tmpfs: Bad mount option %s\n",