Skip to content

Commit 66502b7

Browse files
akpm00Michal Hocko
authored andcommitted
mm-fs-introduce-mapping_gfp_constraint-checkpatch-fixes
WARNING: Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON() torvalds#46: FILE: drivers/gpu/drm/drm_gem.c:494: + BUG_ON(mapping_gfp_constraint(mapping, __GFP_DMA32) && WARNING: line over 80 characters torvalds#73: FILE: fs/btrfs/compression.c:485: + page = __page_cache_alloc(mapping_gfp_constraint(mapping, ~__GFP_FS)); WARNING: Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON() torvalds#183: FILE: fs/logfs/segment.c:60: + BUG_ON(mapping_gfp_constraint(mapping, __GFP_FS)); WARNING: line over 80 characters torvalds#228: FILE: fs/nilfs2/inode.c:359: + mapping_gfp_constraint(inode->i_mapping, ~__GFP_FS)); WARNING: line over 80 characters torvalds#237: FILE: fs/nilfs2/inode.c:525: + mapping_gfp_constraint(inode->i_mapping, ~__GFP_FS)); WARNING: line over 80 characters torvalds#249: FILE: fs/ntfs/file.c:529: + mapping_gfp_constraint(mapping, GFP_KERNEL)); WARNING: line over 80 characters torvalds#261: FILE: fs/splice.c:363: + mapping_gfp_constraint(mapping, GFP_KERNEL)); WARNING: line over 80 characters torvalds#290: FILE: mm/filemap.c:1725: + mapping_gfp_constraint(mapping, GFP_KERNEL)); total: 0 errors, 8 warnings, 205 lines checked ./patches/mm-fs-introduce-mapping_gfp_constraint.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: Michal Hocko <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 16a7dcd commit 66502b7

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

fs/btrfs/compression.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,12 +485,12 @@ static noinline int add_ra_bio_pages(struct inode *inode,
485485
goto next;
486486
}
487487

488-
page = __page_cache_alloc(mapping_gfp_constraint(mapping, ~__GFP_FS));
488+
page = __page_cache_alloc(mapping_gfp_constraint(mapping,
489+
~__GFP_FS));
489490
if (!page)
490491
break;
491492

492-
if (add_to_page_cache_lru(page, mapping, pg_index,
493-
GFP_NOFS)) {
493+
if (add_to_page_cache_lru(page, mapping, pg_index, GFP_NOFS)) {
494494
page_cache_release(page);
495495
goto next;
496496
}

fs/nilfs2/inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
356356
goto failed;
357357

358358
mapping_set_gfp_mask(inode->i_mapping,
359-
mapping_gfp_constraint(inode->i_mapping, ~__GFP_FS));
359+
mapping_gfp_constraint(inode->i_mapping, ~__GFP_FS));
360360

361361
root = NILFS_I(dir)->i_root;
362362
ii = NILFS_I(inode);
@@ -522,7 +522,7 @@ static int __nilfs_read_inode(struct super_block *sb,
522522
up_read(&NILFS_MDT(nilfs->ns_dat)->mi_sem);
523523
nilfs_set_inode_flags(inode);
524524
mapping_set_gfp_mask(inode->i_mapping,
525-
mapping_gfp_constraint(inode->i_mapping, ~__GFP_FS));
525+
mapping_gfp_constraint(inode->i_mapping, ~__GFP_FS));
526526
return 0;
527527

528528
failed_unmap:

fs/ntfs/file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,8 @@ static inline int __ntfs_grab_cache_pages(struct address_space *mapping,
525525
}
526526
}
527527
err = add_to_page_cache_lru(*cached_page, mapping,
528-
index,
529-
mapping_gfp_constraint(mapping, GFP_KERNEL));
528+
index,
529+
mapping_gfp_constraint(mapping, GFP_KERNEL));
530530
if (unlikely(err)) {
531531
if (err == -EEXIST)
532532
continue;

fs/splice.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
360360
break;
361361

362362
error = add_to_page_cache_lru(page, mapping, index,
363-
mapping_gfp_constraint(mapping, GFP_KERNEL));
363+
mapping_gfp_constraint(mapping, GFP_KERNEL));
364364
if (unlikely(error)) {
365365
page_cache_release(page);
366366
if (error == -EEXIST)

mm/filemap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1725,7 +1725,7 @@ static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos,
17251725
goto out;
17261726
}
17271727
error = add_to_page_cache_lru(page, mapping, index,
1728-
mapping_gfp_constraint(mapping, GFP_KERNEL));
1728+
mapping_gfp_constraint(mapping, GFP_KERNEL));
17291729
if (error) {
17301730
page_cache_release(page);
17311731
if (error == -EEXIST) {

0 commit comments

Comments
 (0)