Add B_Uninc flag.

We need to know if a block is already on an uninc list so we
don't put it there again.
So use a flag.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/include/lafs/struct.h b/include/lafs/struct.h
index 9e66ef5990d5c7fa7a03a652e8ff4e75ddb51a9e..97e8fddd3327267a1f388b54c80f2db473f32895 100644 (file)
--- a/include/lafs/struct.h
+++ b/include/lafs/struct.h
@@ -237,4 +237,4 @@ struct lafs_iblk {
 #define B_Index 4
 #define B_Sched 8
 #define B_InoIdx 16
-
+#define B_Uninc 32

diff --git a/lib/lafs_allocated_block.c b/lib/lafs_allocated_block.c
index 3ce830f8a8145abf26d4b15730bf0d29dcafab49..2d358bea33271b5ac51fa3c59501e47cf00482b7 100644 (file)
--- a/lib/lafs_allocated_block.c
+++ b/lib/lafs_allocated_block.c
@@ -35,7 +35,10 @@ void lafs_allocated_block(struct lafs_blk *b, loff_t addr)
        lafs_summary_update(b->ino, b->physaddr, addr,
                            !!(b->flags & B_Index));
        b->physaddr = addr;
-       b->chain = p->uninc;
-       p->uninc = b;
+       if (!(b->flags & B_Uninc)) {
+               b->flags |= B_Uninc;
+               b->chain = p->uninc;
+               p->uninc = b;
+       }
 }
 

diff --git a/lib/lafs_incorporate.c b/lib/lafs_incorporate.c
index 626adeddf85a8f2e1104b199474809a5bb408dda..7c4f87ef8ee96a5f34eee12a152ad5dd89555e87 100644 (file)
--- a/lib/lafs_incorporate.c
+++ b/lib/lafs_incorporate.c
@@ -46,6 +46,7 @@ void lafs_incorporate(struct lafs_iblk *ib)
 
                ib->uninc = b->chain;
                b->chain = NULL;
+               b->flags &= ~B_Uninc;
 
                addr = b->fileaddr - ib->b.fileaddr;
                if (addr >= max_addr)