[Ocfs2-tools-devel] [PATCH 2/2] fsck.ocfs2: fix some indentation problem in pass0.c

piaojun piaojun at huawei.com
Sat Sep 9 20:16:12 PDT 2017


Signed-off-by: Jun Piao <piaojun at huawei.com>
---
 fsck.ocfs2/pass0.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/fsck.ocfs2/pass0.c b/fsck.ocfs2/pass0.c
index bfd11fb..4097bf3 100644
--- a/fsck.ocfs2/pass0.c
+++ b/fsck.ocfs2/pass0.c
@@ -7,12 +7,12 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License, version 2,  as published by the Free Software Foundation.
- *
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- *
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
@@ -375,7 +375,7 @@ static errcode_t repair_group_desc(o2fsck_state *ost,
 		changed = 1;
 	}

-	/* XXX maybe for advanced pain we could check to see if these
+	/* XXX maybe for advanced pain we could check to see if these
 	 * kinds of descs have valid generations for the inodes they
 	 * reference */
 	if ((bg->bg_parent_dinode != di->i_blkno)) {
@@ -456,7 +456,7 @@ static errcode_t repair_group_desc(o2fsck_state *ost,
 		if (ret) {
 			com_err(whoami, ret, "while writing a group "
 				"descriptor to block %"PRIu64" somewhere in "
-				"chain %d in group allocator inode %"PRIu64,
+				"chain %d in group allocator inode %"PRIu64,
 				(uint64_t)bg->bg_blkno, cs->cs_chain_no,
 				(uint64_t)di->i_blkno);
 			ost->ost_saw_error = 1;
@@ -530,7 +530,7 @@ static void unlink_group_desc(o2fsck_state *ost,
 				com_err(whoami, ret, "while writing a group "
 					"descriptor to block %"PRIu64" "
 					"somewhere in chain %d in group "
-					"allocator inode %"PRIu64,
+					"allocator inode %"PRIu64,
 					next_desc, i, (uint64_t)di->i_blkno);
 				ost->ost_saw_error = 1;
 				goto out;
@@ -798,7 +798,7 @@ static errcode_t check_chain(o2fsck_state *ost,
 				clear_ref = 1;
 				break;
 			}
-			
+
 			/* we're not interested in following a broken desc */
 			ret = 0;
 			break;
@@ -807,7 +807,7 @@ static errcode_t check_chain(o2fsck_state *ost,
 			com_err(whoami, ret, "while reading a group "
 				"descriptor from block %"PRIu64" as pointed "
 				"to by chain %d in allocator at inode "
-				"%"PRIu64" at depth %d", blkno,
+				"%"PRIu64" at depth %d", blkno,
 				cs->cs_chain_no, (uint64_t)di->i_blkno, depth);
 			goto out;
 		}
@@ -1035,7 +1035,7 @@ static errcode_t verify_chain_alloc(o2fsck_state *ost,
 			/* when we move a chain to a different rec we have
 			 * to update bg_chain in all the descs in the chain.
 			 * we copy the last chain into the missing spot
-			 * instead of shifting everyone over a spot
+			 * instead of shifting everyone over a spot
 			 * to minimize the number of chains we have to
 			 * update */
 			if (i < (cl->cl_next_free_rec - 1)) {
@@ -1056,7 +1056,7 @@ static errcode_t verify_chain_alloc(o2fsck_state *ost,
 	for (i = cl->cl_next_free_rec; i < cl->cl_count; i++)
 		memset(&cl->cl_recs[i], 0, sizeof(struct ocfs2_chain_rec));

-	if (di->id1.bitmap1.i_total != total ||
+	if (di->id1.bitmap1.i_total != total ||
 	    (di->id1.bitmap1.i_used != total - free)) {
 		if (prompt(ost, PY, PR_CHAIN_GROUP_BITS,
 			   "Allocator inode %"PRIu64" has %u bits "
@@ -1149,14 +1149,14 @@ static errcode_t verify_bitmap_descs(o2fsck_state *ost,
 			"bitmap");
 		goto out;
 	}
-	
+
 	ocfs2_calc_cluster_groups(ost->ost_fs->fs_clusters,
 				  ost->ost_fs->fs_blocksize, &cgs);

 	max_recs = ocfs2_chain_recs_per_inode(ost->ost_fs->fs_blocksize);

 	for (i = 0, blkno = ost->ost_fs->fs_first_cg_blkno;
-	     i < cgs.cgs_cluster_groups;
+	     i < cgs.cgs_cluster_groups;
 	     i++, blkno = i * ocfs2_clusters_to_blocks(ost->ost_fs,
 						       cgs.cgs_cpg)) {
 		o2fsck_bitmap_set(allowed, blkno, NULL);
@@ -1198,7 +1198,7 @@ static errcode_t verify_bitmap_descs(o2fsck_state *ost,
 	/* find the blocks that we think should have been in the chains
 	 * but which weren't found */
 	for (i = 0, blkno = ost->ost_fs->fs_first_cg_blkno;
-	     i < cgs.cgs_cluster_groups;
+	     i < cgs.cgs_cluster_groups;
 	     i++, blkno = i * ocfs2_clusters_to_blocks(ost->ost_fs,
 						       cgs.cgs_cpg)) {

@@ -1251,7 +1251,7 @@ static errcode_t verify_bitmap_descs(o2fsck_state *ost,
 		bg->bg_parent_dinode = di->i_blkno;
 		bg->bg_blkno = blkno;
 		ocfs2_set_bit(0, bg->bg_bitmap);
-		bg->bg_free_bits_count = bg->bg_bits -
+		bg->bg_free_bits_count = bg->bg_bits -
 					 o2fsck_bitcount(bg->bg_bitmap,
 							 (bg->bg_bits + 7)/ 8);

@@ -1343,7 +1343,7 @@ errcode_t o2fsck_pass0(o2fsck_state *ost)
 	}
 	di = (struct ocfs2_dinode *)blocks;

-	ret = ocfs2_malloc0(max_slots * sizeof(ocfs2_cached_inode *),
+	ret = ocfs2_malloc0(max_slots * sizeof(ocfs2_cached_inode *),
 			    &ost->ost_inode_allocs);
 	if (ret) {
 		com_err(whoami, ret, "while cached inodes for each node");
@@ -1485,8 +1485,8 @@ retry_bitmap:

 		ret = verify_chain_alloc(ost, di,
 					 blocks + ost->ost_fs->fs_blocksize,
-					 blocks +
-					 (ost->ost_fs->fs_blocksize * 2),
+					 blocks +
+					 (ost->ost_fs->fs_blocksize * 2),
 					 NULL, NULL);

 		/* XXX maybe helped by the alternate super block */
@@ -1501,7 +1501,7 @@ retry_bitmap:
 		ret = ocfs2_read_cached_inode(ost->ost_fs, blkno, ci);
 		if (ret) {
 			com_err(whoami, ret, "while reading node %d's inode "
-				"allocator inode %"PRIu64, i, blkno);	
+				"allocator inode %"PRIu64, i, blkno);
 			goto out;
 		}

-- 



More information about the Ocfs2-tools-devel mailing list