Skip to content

Commit cd77dc1

Browse files
akpm00sfrothwell
akpm00
authored and
sfrothwell
committed
ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes
WARNING: line over 80 characters torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#64: FILE: fs/ocfs2/alloc.c:3218: + (unsigned long long)le64_to_cpu(eb->h_blkno)); ERROR: code indent should use tabs where possible torvalds#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 torvalds#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 torvalds#80: FILE: fs/ocfs2/alloc.c:4413: + (unsigned long long)le64_to_cpu(eb->h_blkno), ERROR: code indent should use tabs where possible torvalds#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 torvalds#81: FILE: fs/ocfs2/alloc.c:4414: + le16_to_cpu(new_el->l_next_free_rec), ERROR: code indent should use tabs where possible torvalds#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 torvalds#82: FILE: fs/ocfs2/alloc.c:4415: + le16_to_cpu(new_el->l_count)); ERROR: code indent should use tabs where possible torvalds#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 torvalds#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 torvalds#97: FILE: fs/ocfs2/alloc.c:4467: + (unsigned long long)le64_to_cpu(eb->h_blkno), ERROR: code indent should use tabs where possible torvalds#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 torvalds#98: FILE: fs/ocfs2/alloc.c:4468: + le16_to_cpu(new_el->l_next_free_rec)); ERROR: code indent should use tabs where possible torvalds#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 torvalds#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 torvalds#115: FILE: fs/ocfs2/localalloc.c:667: + (unsigned long long)le64_to_cpu(alloc->i_blkno), ERROR: code indent should use tabs where possible torvalds#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 torvalds#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 torvalds#117: FILE: fs/ocfs2/localalloc.c:669: +^I^I^I ocfs2_local_alloc_count_bits(alloc));$ ERROR: code indent should use tabs where possible torvalds#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 torvalds#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 torvalds#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 torvalds#140: FILE: fs/ocfs2/quota_local.c:144: +^I^I^I (unsigned long long)v_block,$ ERROR: code indent should use tabs where possible torvalds#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 <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Stephen Rothwell <[email protected]>
1 parent 502c47b commit cd77dc1

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎fs/ocfs2/alloc.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -1482,16 +1482,16 @@ static int ocfs2_find_branch_target(struct ocfs2_extent_tree *et,
14821482
while(le16_to_cpu(el->l_tree_depth) > 1) {
14831483
if (le16_to_cpu(el->l_next_free_rec) == 0) {
14841484
status = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
1485-
"Owner %llu has empty extent list (next_free_rec == 0)\n",
1486-
(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
1485+
"Owner %llu has empty extent list (next_free_rec == 0)\n",
1486+
(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci));
14871487
goto bail;
14881488
}
14891489
i = le16_to_cpu(el->l_next_free_rec) - 1;
14901490
blkno = le64_to_cpu(el->l_recs[i].e_blkno);
14911491
if (!blkno) {
14921492
status = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
1493-
"Owner %llu has extent list where extent # %d has no physical block start\n",
1494-
(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), i);
1493+
"Owner %llu has extent list where extent # %d has no physical block start\n",
1494+
(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), i);
14951495
goto bail;
14961496
}
14971497

@@ -3213,9 +3213,9 @@ static int ocfs2_rotate_tree_left(handle_t *handle,
32133213

32143214
if (le16_to_cpu(el->l_next_free_rec) == 0) {
32153215
ret = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
3216-
"Owner %llu has empty extent block at %llu\n",
3217-
(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
3218-
(unsigned long long)le64_to_cpu(eb->h_blkno));
3216+
"Owner %llu has empty extent block at %llu\n",
3217+
(unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
3218+
(unsigned long long)le64_to_cpu(eb->h_blkno));
32193219
goto out;
32203220
}
32213221

@@ -4409,10 +4409,10 @@ static int ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,
44094409
bh = path_leaf_bh(left_path);
44104410
eb = (struct ocfs2_extent_block *)bh->b_data;
44114411
status = ocfs2_error(sb,
4412-
"Extent block #%llu has an invalid l_next_free_rec of %d. It should have matched the l_count of %d\n",
4413-
(unsigned long long)le64_to_cpu(eb->h_blkno),
4414-
le16_to_cpu(new_el->l_next_free_rec),
4415-
le16_to_cpu(new_el->l_count));
4412+
"Extent block #%llu has an invalid l_next_free_rec of %d. It should have matched the l_count of %d\n",
4413+
(unsigned long long)le64_to_cpu(eb->h_blkno),
4414+
le16_to_cpu(new_el->l_next_free_rec),
4415+
le16_to_cpu(new_el->l_count));
44164416
goto free_left_path;
44174417
}
44184418
rec = &new_el->l_recs[
@@ -4463,9 +4463,9 @@ static int ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,
44634463
bh = path_leaf_bh(right_path);
44644464
eb = (struct ocfs2_extent_block *)bh->b_data;
44654465
status = ocfs2_error(sb,
4466-
"Extent block #%llu has an invalid l_next_free_rec of %d\n",
4467-
(unsigned long long)le64_to_cpu(eb->h_blkno),
4468-
le16_to_cpu(new_el->l_next_free_rec));
4466+
"Extent block #%llu has an invalid l_next_free_rec of %d\n",
4467+
(unsigned long long)le64_to_cpu(eb->h_blkno),
4468+
le16_to_cpu(new_el->l_next_free_rec));
44694469
goto free_right_path;
44704470
}
44714471
rec = &new_el->l_recs[1];

‎fs/ocfs2/localalloc.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -664,9 +664,9 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
664664
if (le32_to_cpu(alloc->id1.bitmap1.i_used) !=
665665
ocfs2_local_alloc_count_bits(alloc)) {
666666
status = ocfs2_error(osb->sb, "local alloc inode %llu says it has %u used bits, but a count shows %u\n",
667-
(unsigned long long)le64_to_cpu(alloc->i_blkno),
668-
le32_to_cpu(alloc->id1.bitmap1.i_used),
669-
ocfs2_local_alloc_count_bits(alloc));
667+
(unsigned long long)le64_to_cpu(alloc->i_blkno),
668+
le32_to_cpu(alloc->id1.bitmap1.i_used),
669+
ocfs2_local_alloc_count_bits(alloc));
670670
goto bail;
671671
}
672672
#endif

‎fs/ocfs2/quota_local.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ static int ocfs2_read_quota_block(struct inode *inode, u64 v_block,
139139

140140
if (i_size_read(inode) >> inode->i_sb->s_blocksize_bits <= v_block)
141141
return ocfs2_error(inode->i_sb,
142-
"Quota file %llu is probably corrupted! Requested to read block %Lu but file has size only %Lu\n",
143-
(unsigned long long)OCFS2_I(inode)->ip_blkno,
144-
(unsigned long long)v_block,
145-
(unsigned long long)i_size_read(inode));
142+
"Quota file %llu is probably corrupted! Requested to read block %Lu but file has size only %Lu\n",
143+
(unsigned long long)OCFS2_I(inode)->ip_blkno,
144+
(unsigned long long)v_block,
145+
(unsigned long long)i_size_read(inode));
146146

147147
rc = ocfs2_read_virt_blocks(inode, v_block, 1, &tmp, 0,
148148
ocfs2_validate_quota_block);

0 commit comments

Comments
 (0)