gfs2-utils: Fix two logic errors

block_is_in_per_node() only checks the first leaf block when the per_node directory has been split (when the block size is small and/or the number of journals is large). This caused savemeta to treat the files in per_node as user data and so didn't save their metadata. Add an outer loop to iterate over the indirect blocks.

Signed-off-by Andrew Price <[email protected]>

---
  gfs2/edit/savemeta.c | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)

gfs2/edit/savemeta.c +7 -4

index a43045f..360b144 100644
@@ -75,7 +75,7 @@ static int block_is_a_journal(void)
 
  static int block_is_in_per_node(void)
  {
-	int d;
+	int i;
  	struct gfs2_inode *per_node_di;
 
  	if (sbd.gfs1)

@@ -90,9 +90,12 @@ static int block_is_in_per_node(void)
  	do_dinode_extended(&per_node_di->i_di, per_node_di->i_bh);
  	inode_put(&per_node_di);
 
-	for (d = 0; d < indirect->ii[0].dirents; d++) {
-		if (block == indirect->ii[0].dirent[d].block)
-			return TRUE;
+	for (i = 0; i < indirect_blocks; i++) {
+		int d;
+		for (d = 0; d < indirect->ii[i].dirents; d++) {
+			if (block == indirect->ii[i].dirent[d].block)
+				return TRUE;
+		}
  	}
  	return FALSE;
  }

Hi,

Quoted 5 lines · Andrew Price

block_is_in_per_node() only checks the first leaf block when the per_node directory has been split (when the block size is small and/or the number of journals is large). This caused savemeta to treat the files in per_node as user data and so didn't save their metadata. Add an outer loop to iterate over the indirect blocks.

Why does it matter whether the block in the per_node subdir or not? Are we doing something special compared with other directories?

Steve.

Quoted 31 lines

Signed-off-by Andrew Price <[email protected]>

---
  gfs2/edit/savemeta.c | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)

gfs2/edit/savemeta.c +7 -4

index a43045f..360b144 100644
@@ -75,7 +75,7 @@ static int block_is_a_journal(void)
  static int block_is_in_per_node(void)
  {
-    int d;
+    int i;
      struct gfs2_inode *per_node_di;
      if (sbd.gfs1)

@@ -90,9 +90,12 @@ static int block_is_in_per_node(void)
      do_dinode_extended(&per_node_di->i_di, per_node_di->i_bh);
      inode_put(&per_node_di);
-    for (d = 0; d < indirect->ii[0].dirents; d++) {
-        if (block == indirect->ii[0].dirent[d].block)
-            return TRUE;
+    for (i = 0; i < indirect_blocks; i++) {
+        int d;
+        for (d = 0; d < indirect->ii[i].dirents; d++) {
+            if (block == indirect->ii[i].dirent[d].block)
+                return TRUE;
+        }
      }
      return FALSE;
  }