The patch titled
Subject: ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes
has been removed from the -mm tree. Its filename was
ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch
This patch was dropped because it was folded into ocfs2-return-erofs-when-filesystem-becomes-read-only.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes
WARNING: line over 80 characters
#34: FILE: fs/ocfs2/alloc.c:1484:
+ status = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
ERROR: code indent should use tabs where possible
#35: FILE: fs/ocfs2/alloc.c:1485:
+^I^I^I^I "Owner %llu has empty extent list (next_free_rec == 0)\n",$
WARNING: line over 80 characters
#36: FILE: fs/ocfs2/alloc.c:1486:
+ (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
ERROR: code indent should use tabs where possible
#36: FILE: fs/ocfs2/alloc.c:1486:
+^I^I^I^I (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));$
WARNING: line over 80 characters
#46: FILE: fs/ocfs2/alloc.c:1492:
+ status = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
ERROR: code indent should use tabs where possible
#47: FILE: fs/ocfs2/alloc.c:1493:
+^I^I^I^I "Owner %llu has extent list where extent # %d has no physical block start\n",$
WARNING: line over 80 characters
#48: FILE: fs/ocfs2/alloc.c:1494:
+ (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), i);
ERROR: code indent should use tabs where possible
#48: FILE: fs/ocfs2/alloc.c:1494:
+^I^I^I^I (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), i);$
WARNING: line over 80 characters
#61: FILE: fs/ocfs2/alloc.c:3215:
+ ret = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
ERROR: code indent should use tabs where possible
#62: FILE: fs/ocfs2/alloc.c:3216:
+^I^I^I^I "Owner %llu has empty extent block at %llu\n",$
WARNING: line over 80 characters
#63: FILE: fs/ocfs2/alloc.c:3217:
+ (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
ERROR: code indent should use tabs where possible
#63: FILE: fs/ocfs2/alloc.c:3217:
+^I^I^I^I (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),$
WARNING: line over 80 characters
#64: FILE: fs/ocfs2/alloc.c:3218:
+ (unsigned long long)le64_to_cpu(eb->h_blkno));
ERROR: code indent should use tabs where possible
#64: FILE: fs/ocfs2/alloc.c:3218:
+^I^I^I^I (unsigned long long)le64_to_cpu(eb->h_blkno));$
ERROR: code indent should use tabs where possible
#79: FILE: fs/ocfs2/alloc.c:4412:
+^I^I^I^I^I "Extent block #%llu has an invalid l_next_free_rec of %d. It should have matched the l_count of %d\n",$
WARNING: line over 80 characters
#80: FILE: fs/ocfs2/alloc.c:4413:
+ (unsigned long long)le64_to_cpu(eb->h_blkno),
ERROR: code indent should use tabs where possible
#80: FILE: fs/ocfs2/alloc.c:4413:
+^I^I^I^I^I (unsigned long long)le64_to_cpu(eb->h_blkno),$
WARNING: line over 80 characters
#81: FILE: fs/ocfs2/alloc.c:4414:
+ le16_to_cpu(new_el->l_next_free_rec),
ERROR: code indent should use tabs where possible
#81: FILE: fs/ocfs2/alloc.c:4414:
+^I^I^I^I^I le16_to_cpu(new_el->l_next_free_rec),$
WARNING: line over 80 characters
#82: FILE: fs/ocfs2/alloc.c:4415:
+ le16_to_cpu(new_el->l_count));
ERROR: code indent should use tabs where possible
#82: FILE: fs/ocfs2/alloc.c:4415:
+^I^I^I^I^I le16_to_cpu(new_el->l_count));$
ERROR: code indent should use tabs where possible
#96: FILE: fs/ocfs2/alloc.c:4466:
+^I^I^I^I^I "Extent block #%llu has an invalid l_next_free_rec of %d\n",$
WARNING: line over 80 characters
#97: FILE: fs/ocfs2/alloc.c:4467:
+ (unsigned long long)le64_to_cpu(eb->h_blkno),
ERROR: code indent should use tabs where possible
#97: FILE: fs/ocfs2/alloc.c:4467:
+^I^I^I^I^I (unsigned long long)le64_to_cpu(eb->h_blkno),$
WARNING: line over 80 characters
#98: FILE: fs/ocfs2/alloc.c:4468:
+ le16_to_cpu(new_el->l_next_free_rec));
ERROR: code indent should use tabs where possible
#98: FILE: fs/ocfs2/alloc.c:4468:
+^I^I^I^I^I le16_to_cpu(new_el->l_next_free_rec));$
WARNING: line over 80 characters
#114: FILE: fs/ocfs2/localalloc.c:666:
+ status = ocfs2_error(osb->sb, "local alloc inode %llu says it has %u used bits, but a count shows %u\n",
WARNING: line over 80 characters
#115: FILE: fs/ocfs2/localalloc.c:667:
+ (unsigned long long)le64_to_cpu(alloc->i_blkno),
ERROR: code indent should use tabs where possible
#115: FILE: fs/ocfs2/localalloc.c:667:
+^I^I^I (unsigned long long)le64_to_cpu(alloc->i_blkno),$
ERROR: code indent should use tabs where possible
#116: FILE: fs/ocfs2/localalloc.c:668:
+^I^I^I le32_to_cpu(alloc->id1.bitmap1.i_used),$
ERROR: code indent should use tabs where possible
#117: FILE: fs/ocfs2/localalloc.c:669:
+^I^I^I ocfs2_local_alloc_count_bits(alloc));$
ERROR: code indent should use tabs where possible
#138: FILE: fs/ocfs2/quota_local.c:142:
+^I^I^I "Quota file %llu is probably corrupted! Requested to read block %Lu but file has size only %Lu\n",$
WARNING: %Lu is non-standard C, use %llu
#138: FILE: fs/ocfs2/quota_local.c:142:
+ "Quota file %llu is probably corrupted! Requested to read block %Lu but file has size only %Lu\n",
ERROR: code indent should use tabs where possible
#139: FILE: fs/ocfs2/quota_local.c:143:
+^I^I^I (unsigned long long)OCFS2_I(inode)->ip_blkno,$
ERROR: code indent should use tabs where possible
#140: FILE: fs/ocfs2/quota_local.c:144:
+^I^I^I (unsigned long long)v_block,$
ERROR: code indent should use tabs where possible
#141: FILE: fs/ocfs2/quota_local.c:145:
+^I^I^I (unsigned long long)i_size_read(inode));$
total: 21 errors, 15 warnings, 108 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/ocfs2-return-erofs-when-filesystem-becomes-read-only.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: Jun Piao <piaojun@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/alloc.c | 28 ++++++++++++++--------------
fs/ocfs2/localalloc.c | 6 +++---
fs/ocfs2/quota_local.c | 8 ++++----
3 files changed, 21 insertions(+), 21 deletions(-)
--- a/fs/ocfs2/alloc.c~ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes
+++ a/fs/ocfs2/alloc.c
@@ -1482,16 +1482,16 @@ static int ocfs2_find_branch_target(stru
while(le16_to_cpu(el->l_tree_depth) > 1) {
if (le16_to_cpu(el->l_next_free_rec) == 0) {
status = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
- "Owner %llu has empty extent list (next_free_rec == 0)\n",
- (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
+ "Owner %llu has empty extent list (next_free_rec == 0)\n",
+ (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
goto bail;
}
i = le16_to_cpu(el->l_next_free_rec) - 1;
blkno = le64_to_cpu(el->l_recs[i].e_blkno);
if (!blkno) {
status = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
- "Owner %llu has extent list where extent # %d has no physical block start\n",
- (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), i);
+ "Owner %llu has extent list where extent # %d has no physical block start\n",
+ (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), i);
goto bail;
}
@@ -3213,9 +3213,9 @@ rightmost_no_delete:
if (le16_to_cpu(el->l_next_free_rec) == 0) {
ret = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
- "Owner %llu has empty extent block at %llu\n",
- (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
- (unsigned long long)le64_to_cpu(eb->h_blkno));
+ "Owner %llu has empty extent block at %llu\n",
+ (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
+ (unsigned long long)le64_to_cpu(eb->h_blkno));
goto out;
}
@@ -4409,10 +4409,10 @@ static int ocfs2_figure_merge_contig_typ
bh = path_leaf_bh(left_path);
eb = (struct ocfs2_extent_block *)bh->b_data;
status = ocfs2_error(sb,
- "Extent block #%llu has an invalid l_next_free_rec of %d. It should have matched the l_count of %d\n",
- (unsigned long long)le64_to_cpu(eb->h_blkno),
- le16_to_cpu(new_el->l_next_free_rec),
- le16_to_cpu(new_el->l_count));
+ "Extent block #%llu has an invalid l_next_free_rec of %d. It should have matched the l_count of %d\n",
+ (unsigned long long)le64_to_cpu(eb->h_blkno),
+ le16_to_cpu(new_el->l_next_free_rec),
+ le16_to_cpu(new_el->l_count));
goto free_left_path;
}
rec = &new_el->l_recs[
@@ -4463,9 +4463,9 @@ static int ocfs2_figure_merge_contig_typ
bh = path_leaf_bh(right_path);
eb = (struct ocfs2_extent_block *)bh->b_data;
status = ocfs2_error(sb,
- "Extent block #%llu has an invalid l_next_free_rec of %d\n",
- (unsigned long long)le64_to_cpu(eb->h_blkno),
- le16_to_cpu(new_el->l_next_free_rec));
+ "Extent block #%llu has an invalid l_next_free_rec of %d\n",
+ (unsigned long long)le64_to_cpu(eb->h_blkno),
+ le16_to_cpu(new_el->l_next_free_rec));
goto free_right_path;
}
rec = &new_el->l_recs[1];
--- a/fs/ocfs2/localalloc.c~ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes
+++ a/fs/ocfs2/localalloc.c
@@ -664,9 +664,9 @@ int ocfs2_reserve_local_alloc_bits(struc
if (le32_to_cpu(alloc->id1.bitmap1.i_used) !=
ocfs2_local_alloc_count_bits(alloc)) {
status = ocfs2_error(osb->sb, "local alloc inode %llu says it has %u used bits, but a count shows %u\n",
- (unsigned long long)le64_to_cpu(alloc->i_blkno),
- le32_to_cpu(alloc->id1.bitmap1.i_used),
- ocfs2_local_alloc_count_bits(alloc));
+ (unsigned long long)le64_to_cpu(alloc->i_blkno),
+ le32_to_cpu(alloc->id1.bitmap1.i_used),
+ ocfs2_local_alloc_count_bits(alloc));
goto bail;
}
#endif
--- a/fs/ocfs2/quota_local.c~ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes
+++ a/fs/ocfs2/quota_local.c
@@ -139,10 +139,10 @@ static int ocfs2_read_quota_block(struct
if (i_size_read(inode) >> inode->i_sb->s_blocksize_bits <= v_block)
return ocfs2_error(inode->i_sb,
- "Quota file %llu is probably corrupted! Requested to read block %Lu but file has size only %Lu\n",
- (unsigned long long)OCFS2_I(inode)->ip_blkno,
- (unsigned long long)v_block,
- (unsigned long long)i_size_read(inode));
+ "Quota file %llu is probably corrupted! Requested to read block %Lu but file has size only %Lu\n",
+ (unsigned long long)OCFS2_I(inode)->ip_blkno,
+ (unsigned long long)v_block,
+ (unsigned long long)i_size_read(inode));
rc = ocfs2_read_virt_blocks(inode, v_block, 1, &tmp, 0,
ocfs2_validate_quota_block);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-return-erofs-when-filesystem-becomes-read-only.patch
tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch
tools-modifying-page-types-to-include-shared-map-counts-fix-checkpatch-fixes.patch
tools-adding-support-for-idle-page-tracking-to-tool-fix.patch
mpage-add-argument-structure-for-do_mpage_readpage-checkpatch-fixes.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
