include iolock info in strblk

Also make sure info is useful when iolock_written is used.

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

diff --git a/checkpoint.c b/checkpoint.c
index 5f21acdeec7ac66c349b7e9986ed35b99e4bf4e6..cac045526dbaa78215028f466ffcf6304b06b21f 100644 (file)
--- a/checkpoint.c
+++ b/checkpoint.c
@@ -164,6 +164,13 @@ char *strblk(struct block *b)
                        iblk(b)->uninc ? "*" : "",
                        iblk(b)->uninc_next ? "+" : "");
        }
+#ifdef DEBUG_IOLOCK
+       if (test_bit(B_IOLock, &b->flags)) {
+               sprintf(ans+strlen(ans), "<%s:%d>",
+                       strrchr(b->iolock_file, '/'),
+                       b->iolock_line);
+       }
+#endif
        if (!b->parent)
                sprintf(ans+strlen(ans), " NP");
 #if DEBUG_REF

diff --git a/io.c b/io.c
index 9810d5f44f177d1b50dec2b03b89be5c13d81f7e..d15bec8c254fa2fd97a0a7a52b4a1d48e1bb241f 100644 (file)
--- a/io.c
+++ b/io.c
@@ -363,7 +363,7 @@ static void wait_writeback(struct block *b)
        }
 }
 
-void lafs_iolock_written(struct block *b)
+void _lafs_iolock_written(struct block *b)
 {
        lafs_iolock_block(b);
        wait_writeback(b);

diff --git a/lafs.h b/lafs.h
index c4f96d1f7aad485ddb5190cce5e1a9190117997d..bfd0fa5f0791792f15fd476535b3906dc03c1b2e 100644 (file)
--- a/lafs.h
+++ b/lafs.h
@@ -114,10 +114,11 @@ int lafs_index_empty(struct indexblock *ib);
 #define set_iolock_info(b) (0)
 #endif
 #define lafs_iolock_block(b) do { _lafs_iolock_block(b); set_iolock_info(b); } while(0)
+#define lafs_iolock_written(b) do { _lafs_iolock_written(b); set_iolock_info(b); } while(0)
 
 void lafs_io_wake(struct block *b);
 void _lafs_iolock_block(struct block *b);
-void lafs_iolock_written(struct block *b);
+void _lafs_iolock_written(struct block *b);
 void lafs_iounlock_block(struct block *b);
 void lafs_iocheck_block(struct datablock *db, int unlock);
 void lafs_iocheck_writeback(struct datablock *db, int unlock);