aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaowei Bai <baiyaowei@cmss.chinamobile.com>2016-01-20 18:01:11 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-20 20:09:18 -0500
commit2954e440be7305134be632a94536b412899490f7 (patch)
treeb9f69c4b8bde985621c0184a229e1793d9ffcd76
parent06af1c52c9ea234e0b1266cc0b52c3e0c6c8fe9f (diff)
ipc/shm.c: is_file_shm_hugepages() can be boolean
Make is_file_shm_hugepages() return bool to improve readability due to this particular function only using either one or zero as its return value. No functional change. Signed-off-by: Yaowei Bai <baiyaowei@cmss.chinamobile.com> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/shm.h6
-rw-r--r--ipc/shm.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/shm.h b/include/linux/shm.h
index 6fb801686ad6..04e881829625 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -52,7 +52,7 @@ struct sysv_shm {
52 52
53long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr, 53long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr,
54 unsigned long shmlba); 54 unsigned long shmlba);
55int is_file_shm_hugepages(struct file *file); 55bool is_file_shm_hugepages(struct file *file);
56void exit_shm(struct task_struct *task); 56void exit_shm(struct task_struct *task);
57#define shm_init_task(task) INIT_LIST_HEAD(&(task)->sysvshm.shm_clist) 57#define shm_init_task(task) INIT_LIST_HEAD(&(task)->sysvshm.shm_clist)
58#else 58#else
@@ -66,9 +66,9 @@ static inline long do_shmat(int shmid, char __user *shmaddr,
66{ 66{
67 return -ENOSYS; 67 return -ENOSYS;
68} 68}
69static inline int is_file_shm_hugepages(struct file *file) 69static inline bool is_file_shm_hugepages(struct file *file)
70{ 70{
71 return 0; 71 return false;
72} 72}
73static inline void exit_shm(struct task_struct *task) 73static inline void exit_shm(struct task_struct *task)
74{ 74{
diff --git a/ipc/shm.c b/ipc/shm.c
index 41787276e141..ed3027d0f277 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -459,7 +459,7 @@ static const struct file_operations shm_file_operations_huge = {
459 .fallocate = shm_fallocate, 459 .fallocate = shm_fallocate,
460}; 460};
461 461
462int is_file_shm_hugepages(struct file *file) 462bool is_file_shm_hugepages(struct file *file)
463{ 463{
464 return file->f_op == &shm_file_operations_huge; 464 return file->f_op == &shm_file_operations_huge;
465} 465}