cfs: ... simplify a bit

Sokolov Yura · Sokolov Yura · commit ad263d183c26 · 2017-06-28T15:29:42.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -1050,16 +1050,13 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 			second_pass++;
 		}
 
-		if (n_pages1 > n_pages)
+		/* if file were truncated (vacuum???), clean a bit */
+		for (i = n_pages; i < n_pages1; i++)
 		{
-			/* if file were truncated (vacuum???), clean a bit */
-			for (i = n_pages; i < n_pages1; i++)
-			{
-				inode_t nnode = newMap->inodes[i];
-				if (CFS_INODE_SIZE(nnode) != 0) {
-					newUsed -= CFS_INODE_SIZE(nnode);
-					newMap->inodes[i] = CFS_INODE(0, 0);
-				}
+			inode_t nnode = newMap->inodes[i];
+			if (CFS_INODE_SIZE(nnode) != 0) {
+				newUsed -= CFS_INODE_SIZE(nnode);
+				newMap->inodes[i] = CFS_INODE(0, 0);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1050,16 +1050,13 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1050`	`1050`	`second_pass++;`
`1051`	`1051`	`}`
`1052`	`1052`
`1053`		`- if (n_pages1 > n_pages)`
	`1053`	`+ /* if file were truncated (vacuum???), clean a bit */`
	`1054`	`+ for (i = n_pages; i < n_pages1; i++)`
`1054`	`1055`	`{`
`1055`		`- /* if file were truncated (vacuum???), clean a bit */`
`1056`		`- for (i = n_pages; i < n_pages1; i++)`
`1057`		`- {`
`1058`		`- inode_t nnode = newMap->inodes[i];`
`1059`		`- if (CFS_INODE_SIZE(nnode) != 0) {`
`1060`		`- newUsed -= CFS_INODE_SIZE(nnode);`
`1061`		`- newMap->inodes[i] = CFS_INODE(0, 0);`
`1062`		`- }`
	`1056`	`+ inode_t nnode = newMap->inodes[i];`
	`1057`	`+ if (CFS_INODE_SIZE(nnode) != 0) {`
	`1058`	`+ newUsed -= CFS_INODE_SIZE(nnode);`
	`1059`	`+ newMap->inodes[i] = CFS_INODE(0, 0);`
`1063`	`1060`	`}`
`1064`	`1061`	`}`
`1065`	`1062`