xfs
[Top] [All Lists]

[PATCH] xfs: fix agno increment in xfs_inumbers() loop

To: xfs-oss <xfs@xxxxxxxxxxx>, Jie Liu <jeff.liu@xxxxxxxxxx>
Subject: [PATCH] xfs: fix agno increment in xfs_inumbers() loop
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Sun, 12 Oct 2014 13:26:17 -0500
Delivered-to: xfs@xxxxxxxxxxx
commit c7cb51d xfs: fix error handling at xfs_inumbers
caused a regression in xfs_inumbers, which in turn broke
xfsdump, causing incomplete dumps.

The loop in xfs_inumbers() needs to fill the user-supplied
buffers, and iterates via xfs_btree_increment, reading new
ags as needed.

But the first time through the loop, if xfs_btree_increment()
succeeds, we continue, which triggers the ++agno at the bottom
of the loop, and we skip to soon to the next ag - without
the proper setup under next_ag to read the next ag.

Fix this by removing the agno increment from the loop conditional,
and only increment agno if we have actually hit the code under
the next_ag: target.

Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---

p.s. it's alarming that apparently no test in the dump group
detects this problem!  I'll look into it.

So I can say that I've tested this with xfstests, but I guess
that doesn't matter much, yet.

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index f71be9c..f1deb96 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -639,7 +639,8 @@ next_ag:
                xfs_buf_relse(agbp);
                agbp = NULL;
                agino = 0;
-       } while (++agno < mp->m_sb.sb_agcount);
+               agno++;
+       } while (agno < mp->m_sb.sb_agcount);
 
        if (!error) {
                if (bufidx) {

<Prev in Thread] Current Thread [Next in Thread>