mm/mempool: minor coding style tweaks

Zhiyuan Dai · torvalds · commit 68d68ff6ebbf · 2021-05-05T11:27:27.000-07:00
Various coding style tweaks to various files under mm/ [daizhiyuan@phytium.com.cn: mm/swapfile: minor coding style tweaks] Link: https://lkml.kernel.org/r/1614223624-16055-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/sparse: minor coding style tweaks] Link: https://lkml.kernel.org/r/1614227288-19363-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/vmscan: minor coding style tweaks] Link: https://lkml.kernel.org/r/1614227649-19853-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/compaction: minor coding style tweaks] Link: https://lkml.kernel.org/r/1614228218-20770-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/oom_kill: minor coding style tweaks] Link: https://lkml.kernel.org/r/1614228360-21168-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/shmem: minor coding style tweaks] Link: https://lkml.kernel.org/r/1614228504-21491-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/page_alloc: minor coding style tweaks] Link: https://lkml.kernel.org/r/1614228613-21754-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/filemap: minor coding style tweaks] Link: https://lkml.kernel.org/r/1614228936-22337-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/mlock: minor coding style tweaks] Link: https://lkml.kernel.org/r/1613956588-2453-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/frontswap: minor coding style tweaks] Link: https://lkml.kernel.org/r/1613962668-15045-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/vmalloc: minor coding style tweaks] Link: https://lkml.kernel.org/r/1613963379-15988-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/memory_hotplug: minor coding style tweaks] Link: https://lkml.kernel.org/r/1613971784-24878-1-git-send-email-daizhiyuan@phytium.com.cn [daizhiyuan@phytium.com.cn: mm/mempolicy: minor coding style tweaks] Link: https://lkml.kernel.org/r/1613972228-25501-1-git-send-email-daizhiyuan@phytium.com.cn Link: https://lkml.kernel.org/r/1614222374-13805-1-git-send-email-daizhiyuan@phytium.com.cn Signed-off-by: Zhiyuan Dai <daizhiyuan@phytium.com.cn> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/mm/compaction.c b/mm/compaction.c
@@ -2885,7 +2885,7 @@ void wakeup_kcompactd(pg_data_t *pgdat, int order, int highest_zoneidx)
  */
 static int kcompactd(void *p)
 {
-	pg_data_t *pgdat = (pg_data_t*)p;
+	pg_data_t *pgdat = (pg_data_t *)p;
 	struct task_struct *tsk = current;
 	unsigned int proactive_defer = 0;
 
diff --git a/mm/filemap.c b/mm/filemap.c
@@ -3267,7 +3267,7 @@ const struct vm_operations_struct generic_file_vm_ops = {
 
 /* This is used for a general mmap of a disk file */
 
-int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+int generic_file_mmap(struct file *file, struct vm_area_struct *vma)
 {
 	struct address_space *mapping = file->f_mapping;
 
@@ -3292,11 +3292,11 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
 {
 	return VM_FAULT_SIGBUS;
 }
-int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+int generic_file_mmap(struct file *file, struct vm_area_struct *vma)
 {
 	return -ENOSYS;
 }
-int generic_file_readonly_mmap(struct file * file, struct vm_area_struct * vma)
+int generic_file_readonly_mmap(struct file *file, struct vm_area_struct *vma)
 {
 	return -ENOSYS;
 }
@@ -3724,7 +3724,7 @@ EXPORT_SYMBOL(generic_perform_write);
 ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
 	struct file *file = iocb->ki_filp;
-	struct address_space * mapping = file->f_mapping;
+	struct address_space *mapping = file->f_mapping;
 	struct inode 	*inode = mapping->host;
 	ssize_t		written = 0;
 	ssize_t		err;
diff --git a/mm/frontswap.c b/mm/frontswap.c
@@ -60,16 +60,20 @@ static u64 frontswap_succ_stores;
 static u64 frontswap_failed_stores;
 static u64 frontswap_invalidates;
 
-static inline void inc_frontswap_loads(void) {
+static inline void inc_frontswap_loads(void)
+{
 	data_race(frontswap_loads++);
 }
-static inline void inc_frontswap_succ_stores(void) {
+static inline void inc_frontswap_succ_stores(void)
+{
 	data_race(frontswap_succ_stores++);
 }
-static inline void inc_frontswap_failed_stores(void) {
+static inline void inc_frontswap_failed_stores(void)
+{
 	data_race(frontswap_failed_stores++);
 }
-static inline void inc_frontswap_invalidates(void) {
+static inline void inc_frontswap_invalidates(void)
+{
 	data_race(frontswap_invalidates++);
 }
 #else
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
@@ -834,7 +834,7 @@ static inline struct zone *default_zone_for_pfn(int nid, unsigned long start_pfn
 	return movable_node_enabled ? movable_zone : kernel_zone;
 }
 
-struct zone * zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
+struct zone *zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
 		unsigned long nr_pages)
 {
 	if (online_type == MMOP_ONLINE_KERNEL)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
@@ -330,7 +330,7 @@ static void mpol_rebind_nodemask(struct mempolicy *pol, const nodemask_t *nodes)
 	else if (pol->flags & MPOL_F_RELATIVE_NODES)
 		mpol_relative_nodemask(&tmp, &pol->w.user_nodemask, nodes);
 	else {
-		nodes_remap(tmp, pol->v.nodes,pol->w.cpuset_mems_allowed,
+		nodes_remap(tmp, pol->v.nodes, pol->w.cpuset_mems_allowed,
 								*nodes);
 		pol->w.cpuset_mems_allowed = *nodes;
 	}
@@ -1161,7 +1161,7 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
 
 	tmp = *from;
 	while (!nodes_empty(tmp)) {
-		int s,d;
+		int s, d;
 		int source = NUMA_NO_NODE;
 		int dest = 0;
 
diff --git a/mm/mempool.c b/mm/mempool.c
@@ -251,7 +251,7 @@ EXPORT_SYMBOL(mempool_init);
 mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
 				mempool_free_t *free_fn, void *pool_data)
 {
-	return mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,
+	return mempool_create_node(min_nr, alloc_fn, free_fn, pool_data,
 				   GFP_KERNEL, NUMA_NO_NODE);
 }
 EXPORT_SYMBOL(mempool_create);
diff --git a/mm/mlock.c b/mm/mlock.c
@@ -559,7 +559,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len,
 				vm_flags_t flags)
 {
 	unsigned long nstart, end, tmp;
-	struct vm_area_struct * vma, * prev;
+	struct vm_area_struct *vma, *prev;
 	int error;
 
 	VM_BUG_ON(offset_in_page(start));
@@ -737,7 +737,7 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
  */
 static int apply_mlockall_flags(int flags)
 {
-	struct vm_area_struct * vma, * prev = NULL;
+	struct vm_area_struct *vma, *prev = NULL;
 	vm_flags_t to_add = 0;
 
 	current->mm->def_flags &= VM_LOCKED_CLEAR_MASK;
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
@@ -993,7 +993,7 @@ static void oom_kill_process(struct oom_control *oc, const char *message)
 	if (oom_group) {
 		mem_cgroup_print_oom_group(oom_group);
 		mem_cgroup_scan_tasks(oom_group, oom_kill_memcg_member,
-				      (void*)message);
+				      (void *)message);
 		mem_cgroup_put(oom_group);
 	}
 }
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
@@ -8808,7 +8808,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,
 	ret = __alloc_contig_migrate_range(&cc, start, end);
 	if (ret && ret != -EBUSY)
 		goto done;
-	ret =0;
+	ret = 0;
 
 	/*
 	 * Pages from [start, end) are within a MAX_ORDER_NR_PAGES
diff --git a/mm/shmem.c b/mm/shmem.c
@@ -3508,7 +3508,7 @@ static int shmem_parse_options(struct fs_context *fc, void *data)
 			}
 		}
 		if (*this_char) {
-			char *value = strchr(this_char,'=');
+			char *value = strchr(this_char, '=');
 			size_t len = 0;
 			int err;
 
diff --git a/mm/sparse.c b/mm/sparse.c
@@ -257,7 +257,7 @@ static void __init memory_present(int nid, unsigned long start, unsigned long en
 	if (unlikely(!mem_section)) {
 		unsigned long size, align;
 
-		size = sizeof(struct mem_section*) * NR_SECTION_ROOTS;
+		size = sizeof(struct mem_section *) * NR_SECTION_ROOTS;
 		align = 1 << (INTERNODE_CACHE_SHIFT);
 		mem_section = memblock_alloc(size, align);
 		if (!mem_section)
diff --git a/mm/swapfile.c b/mm/swapfile.c
@@ -2780,7 +2780,7 @@ static int swap_show(struct seq_file *swap, void *v)
 	unsigned int bytes, inuse;
 
 	if (si == SEQ_START_TOKEN) {
-		seq_puts(swap,"Filename\t\t\t\tType\t\tSize\t\tUsed\t\tPriority\n");
+		seq_puts(swap, "Filename\t\t\t\tType\t\tSize\t\tUsed\t\tPriority\n");
 		return 0;
 	}
 
@@ -3284,7 +3284,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
 					 sizeof(long),
 					 GFP_KERNEL);
 
-	if (p->bdev &&(swap_flags & SWAP_FLAG_DISCARD) && swap_discardable(p)) {
+	if (p->bdev && (swap_flags & SWAP_FLAG_DISCARD) && swap_discardable(p)) {
 		/*
 		 * When discard is enabled for swap with no particular
 		 * policy flagged, we set all swap discard flags here in
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
@@ -3083,7 +3083,7 @@ EXPORT_SYMBOL(vzalloc_node);
  * 64b systems should always have either DMA or DMA32 zones. For others
  * GFP_DMA32 should do the right thing and use the normal zone.
  */
-#define GFP_VMALLOC32 GFP_DMA32 | GFP_KERNEL
+#define GFP_VMALLOC32 (GFP_DMA32 | GFP_KERNEL)
 #endif
 
 /**
diff --git a/mm/vmscan.c b/mm/vmscan.c
@@ -4059,7 +4059,7 @@ static int kswapd(void *p)
 {
 	unsigned int alloc_order, reclaim_order;
 	unsigned int highest_zoneidx = MAX_NR_ZONES - 1;
-	pg_data_t *pgdat = (pg_data_t*)p;
+	pg_data_t *pgdat = (pg_data_t *)p;
 	struct task_struct *tsk = current;
 	const struct cpumask *cpumask = cpumask_of_node(pgdat->node_id);
 

Original file line number	Diff line number	Diff line change
`@@ -2885,7 +2885,7 @@ void wakeup_kcompactd(pg_data_t *pgdat, int order, int highest_zoneidx)`
`2885`	`2885`	`*/`
`2886`	`2886`	`static int kcompactd(void *p)`
`2887`	`2887`	`{`
`2888`		`- pg_data_t pgdat = (pg_data_t)p;`
	`2888`	`+ pg_data_t pgdat = (pg_data_t )p;`
`2889`	`2889`	`struct task_struct *tsk = current;`
`2890`	`2890`	`unsigned int proactive_defer = 0;`
`2891`	`2891`
Original file line number	Diff line number	Diff line change
`@@ -3267,7 +3267,7 @@ const struct vm_operations_struct generic_file_vm_ops = {`
`3267`	`3267`
`3268`	`3268`	`/* This is used for a general mmap of a disk file */`
`3269`	`3269`
`3270`		`-int generic_file_mmap(struct file * file, struct vm_area_struct * vma)`
	`3270`	`+int generic_file_mmap(struct file file, struct vm_area_struct vma)`
`3271`	`3271`	`{`
`3272`	`3272`	`struct address_space *mapping = file->f_mapping;`
`3273`	`3273`
`@@ -3292,11 +3292,11 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)`
`3292`	`3292`	`{`
`3293`	`3293`	`return VM_FAULT_SIGBUS;`
`3294`	`3294`	`}`
`3295`		`-int generic_file_mmap(struct file * file, struct vm_area_struct * vma)`
	`3295`	`+int generic_file_mmap(struct file file, struct vm_area_struct vma)`
`3296`	`3296`	`{`
`3297`	`3297`	`return -ENOSYS;`
`3298`	`3298`	`}`
`3299`		`-int generic_file_readonly_mmap(struct file * file, struct vm_area_struct * vma)`
	`3299`	`+int generic_file_readonly_mmap(struct file file, struct vm_area_struct vma)`
`3300`	`3300`	`{`
`3301`	`3301`	`return -ENOSYS;`
`3302`	`3302`	`}`
`@@ -3724,7 +3724,7 @@ EXPORT_SYMBOL(generic_perform_write);`
`3724`	`3724`	`ssize_t __generic_file_write_iter(struct kiocb iocb, struct iov_iter from)`
`3725`	`3725`	`{`
`3726`	`3726`	`struct file *file = iocb->ki_filp;`
`3727`		`- struct address_space * mapping = file->f_mapping;`
	`3727`	`+ struct address_space *mapping = file->f_mapping;`
`3728`	`3728`	`struct inode *inode = mapping->host;`
`3729`	`3729`	`ssize_t written = 0;`
`3730`	`3730`	`ssize_t err;`
Original file line number	Diff line number	Diff line change
`@@ -60,16 +60,20 @@ static u64 frontswap_succ_stores;`
`60`	`60`	`static u64 frontswap_failed_stores;`
`61`	`61`	`static u64 frontswap_invalidates;`
`62`	`62`
`63`		`-static inline void inc_frontswap_loads(void) {`
	`63`	`+static inline void inc_frontswap_loads(void)`
	`64`	`+{`
`64`	`65`	`data_race(frontswap_loads++);`
`65`	`66`	`}`
`66`		`-static inline void inc_frontswap_succ_stores(void) {`
	`67`	`+static inline void inc_frontswap_succ_stores(void)`
	`68`	`+{`
`67`	`69`	`data_race(frontswap_succ_stores++);`
`68`	`70`	`}`
`69`		`-static inline void inc_frontswap_failed_stores(void) {`
	`71`	`+static inline void inc_frontswap_failed_stores(void)`
	`72`	`+{`
`70`	`73`	`data_race(frontswap_failed_stores++);`
`71`	`74`	`}`
`72`		`-static inline void inc_frontswap_invalidates(void) {`
	`75`	`+static inline void inc_frontswap_invalidates(void)`
	`76`	`+{`
`73`	`77`	`data_race(frontswap_invalidates++);`
`74`	`78`	`}`
`75`	`79`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ static inline struct zone *default_zone_for_pfn(int nid, unsigned long start_pfn`
`834`	`834`	`return movable_node_enabled ? movable_zone : kernel_zone;`
`835`	`835`	`}`
`836`	`836`
`837`		`-struct zone * zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,`
	`837`	`+struct zone *zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,`
`838`	`838`	`unsigned long nr_pages)`
`839`	`839`	`{`
`840`	`840`	`if (online_type == MMOP_ONLINE_KERNEL)`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ EXPORT_SYMBOL(mempool_init);`
`251`	`251`	`mempool_t mempool_create(int min_nr, mempool_alloc_t alloc_fn,`
`252`	`252`	`mempool_free_t free_fn, void pool_data)`
`253`	`253`	`{`
`254`		`- return mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,`
	`254`	`+ return mempool_create_node(min_nr, alloc_fn, free_fn, pool_data,`
`255`	`255`	`GFP_KERNEL, NUMA_NO_NODE);`
`256`	`256`	`}`
`257`	`257`	`EXPORT_SYMBOL(mempool_create);`
Original file line number	Diff line number	Diff line change
`@@ -993,7 +993,7 @@ static void oom_kill_process(struct oom_control oc, const char message)`
`993`	`993`	`if (oom_group) {`
`994`	`994`	`mem_cgroup_print_oom_group(oom_group);`
`995`	`995`	`mem_cgroup_scan_tasks(oom_group, oom_kill_memcg_member,`
`996`		`- (void*)message);`
	`996`	`+ (void *)message);`
`997`	`997`	`mem_cgroup_put(oom_group);`
`998`	`998`	`}`
`999`	`999`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3508,7 +3508,7 @@ static int shmem_parse_options(struct fs_context fc, void data)`
`3508`	`3508`	`}`
`3509`	`3509`	`}`
`3510`	`3510`	`if (*this_char) {`
`3511`		`- char *value = strchr(this_char,'=');`
	`3511`	`+ char *value = strchr(this_char, '=');`
`3512`	`3512`	`size_t len = 0;`
`3513`	`3513`	`int err;`
`3514`	`3514`