From: Darrick J. Wong <djwong@xxxxxxxxxx>
Use a for loop to scan the AGs, and make all the variables local like
you'd expect them to be.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
common/populate | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/populate b/common/populate
index e4090a29d3..29ea637ecb 100644
--- a/common/populate
+++ b/common/populate
@@ -599,8 +599,8 @@ __populate_check_xfs_attr() {
# Check that there's at least one per-AG btree with multiple levels
__populate_check_xfs_agbtree_height() {
- bt_type="$1"
- nr_ags=$(_scratch_xfs_db -c 'sb 0' -c 'p agcount' | awk '{print $3}')
+ local bt_type="$1"
+ local agcount=$(_scratch_xfs_db -c 'sb 0' -c 'p agcount' | awk '{print $3}')
case "${bt_type}" in
"bno"|"cnt"|"rmap"|"refcnt")
@@ -620,13 +620,14 @@ __populate_check_xfs_agbtree_height() {
;;
esac
- seq 0 $((nr_ags - 1)) | while read ag; do
- bt_level=$(_scratch_xfs_db -c "${hdr} ${ag}" -c "p ${bt_prefix}level" | awk '{print $3}')
+ for ((agno = 0; agno < agcount; agno++)); do
+ bt_level=$(_scratch_xfs_db -c "${hdr} ${agno}" -c "p ${bt_prefix}level" | awk '{print $3}')
+ # "level" is really the btree height
if [ "${bt_level}" -gt 1 ]; then
- return 100
+ return 0
fi
done
- test $? -eq 100 || __populate_fail "Failed to create ${bt_type} of sufficient height!"
+ __populate_fail "Failed to create ${bt_type} of sufficient height!"
return 1
}
