Messages in this thread Patch in this message | | | Date | Wed, 21 Aug 2013 10:23:58 +0800 | From | Chen Gang <> | Subject | [PATCH 2/3] mm/shmem.c: let shmem_show_mpol() return value. |
| |
Let shmem_show_mpol() return value, since it may fail.
Signed-off-by: Chen Gang <gang.chen@asianux.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com> --- mm/shmem.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c index 75010ba..e59d332 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -883,16 +883,17 @@ redirty: #ifdef CONFIG_NUMA #ifdef CONFIG_TMPFS -static void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol) +static int shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol) { char buffer[64]; if (!mpol || mpol->mode == MPOL_DEFAULT) - return; /* show nothing */ + return 0; /* show nothing */ mpol_to_str(buffer, sizeof(buffer), mpol); seq_printf(seq, ",mpol=%s", buffer); + return 0; } static struct mempolicy *shmem_get_sbmpol(struct shmem_sb_info *sbinfo) @@ -951,8 +952,9 @@ static struct page *shmem_alloc_page(gfp_t gfp, } #else /* !CONFIG_NUMA */ #ifdef CONFIG_TMPFS -static inline void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol) +static inline int shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol) { + return 0; } #endif /* CONFIG_TMPFS */ @@ -2578,8 +2580,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) if (!gid_eq(sbinfo->gid, GLOBAL_ROOT_GID)) seq_printf(seq, ",gid=%u", from_kgid_munged(&init_user_ns, sbinfo->gid)); - shmem_show_mpol(seq, sbinfo->mpol); - return 0; + return shmem_show_mpol(seq, sbinfo->mpol); } #endif /* CONFIG_TMPFS */ -- 1.7.7.6
| |