aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2017-05-26 11:32:01 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2017-05-26 11:32:01 +1000
commit28faf6fec39ce12c780bbb52ef47820ec8fc1fdc (patch)
treead05ed46feb953fdd4b77a6b2baabea3417c8ff6
parenta701cd408166bad1ef60dcb2a012aba023528e7e (diff)
swap-add-block-io-poll-in-swapin-path-checkpatch-fixes
WARNING: function definition argument 'struct page *' should also have an identifier name #60: FILE: include/linux/swap.h:334: +extern int swap_readpage(struct page *, bool do_poll); WARNING: line over 80 characters #164: FILE: mm/swap_state.c:415: + struct vm_area_struct *vma, unsigned long addr, bool do_poll) total: 0 errors, 2 warnings, 140 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. ./patches/swap-add-block-io-poll-in-swapin-path.patch has style problems, please review. NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Shaohua Li <shli@fb.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--include/linux/swap.h2
-rw-r--r--mm/swap_state.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index b0e756218faf..61e7180cee21 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -331,7 +331,7 @@ extern void kswapd_stop(int nid);
#include <linux/blk_types.h> /* for bio_end_io_t */
/* linux/mm/page_io.c */
-extern int swap_readpage(struct page *, bool do_poll);
+extern int swap_readpage(struct page *page, bool do_poll);
extern int swap_writepage(struct page *page, struct writeback_control *wbc);
extern void end_swap_bio_write(struct bio *bio);
extern int __swap_writepage(struct page *page, struct writeback_control *wbc,
diff --git a/mm/swap_state.c b/mm/swap_state.c
index 6683c0207d37..b68c93014f50 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -412,7 +412,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
* the swap entry is no longer in use.
*/
struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
- struct vm_area_struct *vma, unsigned long addr, bool do_poll)
+ struct vm_area_struct *vma, unsigned long addr, bool do_poll)
{
bool page_was_allocated;
struct page *retpage = __read_swap_cache_async(entry, gfp_mask,