The patch titled
Subject: mpage-add-argument-structure-for-do_mpage_readpage-checkpatch-fixes
has been removed from the -mm tree. Its filename was
mpage-add-argument-structure-for-do_mpage_readpage-checkpatch-fixes.patch
This patch was dropped because it was folded into mpage-add-argument-structure-for-do_mpage_readpage.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mpage-add-argument-structure-for-do_mpage_readpage-checkpatch-fixes
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
#49: FILE: fs/mpage.c:139:
+ unsigned nr_pages;
WARNING: line over 80 characters
#96: FILE: fs/mpage.c:190:
+ if (buffer_mapped(map_bh) && block_in_file > args->first_logical_block &&
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
#98: FILE: fs/mpage.c:192:
+ unsigned map_offset = block_in_file - args->first_logical_block;
WARNING: line over 80 characters
#135: FILE: fs/mpage.c:296:
+ min_t(int, args->nr_pages, BIO_MAX_PAGES), args->gfp);
ERROR: code indent should use tabs where possible
#169: FILE: fs/mpage.c:321:
+^I block_read_full_page(page, args->get_block);$
total: 1 errors, 4 warnings, 196 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.
NOTE: Whitespace errors detected.
You may wish to use scripts/cleanpatch or scripts/cleanfile
./patches/mpage-add-argument-structure-for-do_mpage_readpage.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
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/mpage.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
--- a/fs/mpage.c~mpage-add-argument-structure-for-do_mpage_readpage-checkpatch-fixes
+++ a/fs/mpage.c
@@ -136,7 +136,7 @@ map_buffer_to_page(struct page *page, st
struct mpage_readpage_args {
struct bio *bio;
struct page *page;
- unsigned nr_pages;
+ unsigned int nr_pages;
sector_t last_block_in_bio;
struct buffer_head map_bh;
unsigned long first_logical_block;
@@ -187,7 +187,8 @@ static struct bio *do_mpage_readpage(str
* Map blocks using the result from the previous get_blocks call first.
*/
nblocks = map_bh->b_size >> blkbits;
- if (buffer_mapped(map_bh) && block_in_file > args->first_logical_block &&
+ if (buffer_mapped(map_bh) &&
+ block_in_file > args->first_logical_block &&
block_in_file < (args->first_logical_block + nblocks)) {
unsigned map_offset = block_in_file - args->first_logical_block;
unsigned last = nblocks - map_offset;
@@ -293,7 +294,9 @@ alloc_new:
goto out;
}
args->bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
- min_t(int, args->nr_pages, BIO_MAX_PAGES), args->gfp);
+ min_t(int, args->nr_pages,
+ BIO_MAX_PAGES),
+ args->gfp);
if (args->bio == NULL)
goto confused;
}
@@ -318,7 +321,7 @@ confused:
if (args->bio)
args->bio = mpage_bio_submit(REQ_OP_READ, 0, args->bio);
if (!PageUptodate(page))
- block_read_full_page(page, args->get_block);
+ block_read_full_page(page, args->get_block);
else
unlock_page(page);
goto out;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mpage-add-argument-structure-for-do_mpage_readpage.patch
mm-drop-vm_bug_on-from-__get_free_pages-fix.patch
mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch
mm-fadvise-fix-signed-overflow-ubsan-complaint-fix.patch
mm-sparsemem-defer-the-ms-section_mem_map-clearing-fix.patch
mm-sparse-optimize-memmap-allocation-during-sparse_init-checkpatch-fixes.patch
mm-sparse-abstract-sparse-buffer-allocations-fix.patch
mm-sparse-abstract-sparse-buffer-allocations-fix-fix.patch
