Use strblk is more places.

Where we printed ino/fileaddr, just use strblk.

diff --git a/clean.c b/clean.c
index dda252a3231e16e9fb31aa40f728c9ac83bfadc0..df499b4eb2cfca413f0ba9d24a07674b1e34a7ba 100644 (file)
--- a/clean.c
+++ b/clean.c
@@ -415,8 +415,7 @@ static int try_clean(struct fs *fs, struct toclean *tc)
        list_for_each_entry_safe(b, tmp, &tc->cleaning, cleaning) {
                struct block *cb;
                int err = lafs_find_block_async(b);
-               dprintk("find_async %d/%d gives %d\n", (int)b->b.inode->i_ino,
-                      (int)b->b.fileaddr, err);
+               dprintk("find_async gives %d %s\n", err, strblk(&b->b));
                if (err == -EAGAIN)
                        continue;
                if (err) {
@@ -453,9 +452,8 @@ static int try_clean(struct fs *fs, struct toclean *tc)
                }
 
                err = mark_cleaning(cb);
-               dprintk("Want to clean %d/%d (%d)\n",
-                      (int)cb->inode->i_ino,
-                      (int)cb->fileaddr, err);
+               dprintk("Want to clean %s (%d)\n",
+                       strblk(cb), err);
 
                putdref(b, MKREF(cleaning));
                putref(cb, MKREF(clean2));

diff --git a/cluster.c b/cluster.c
index 34be1e76b4fc661e2e370a6d05fd6955459e708c..54e81922ed8dedd1ecd05a22a902323f6da40d52 100644 (file)
--- a/cluster.c
+++ b/cluster.c
@@ -431,10 +431,8 @@ static int flush_data_to_inode(struct block *b)
 
        struct fs *fs = sb->s_fs_info;
 
-       dprintk("FLUSHING single block into inode - i=%d b=%d s=%d\n",
-               (int)lai->vfs_inode.i_ino,
-               (int)b->fileaddr,
-               (int)size);
+       dprintk("FLUSHING single block into inode - s=%d %s\n",
+               (int)size, strblk(b));
        if (lai->iblock->depth > 1)
                /* Too much indexing still - truncate must be happening */
                return 0;

diff --git a/dir.c b/dir.c
index f860835cbee5ad409e13dfb995b5f046f20903b5..1c22d191ba532d7209f60805c2dc4434a275f86f 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -1307,8 +1307,7 @@ static int dir_handle_orphan(struct inode *dir, struct datablock *b)
        struct dir_ent de;
        int err;
 
-       dprintk("HANDLE ORPHAN i=%d b=%d h=%x\n", (int)dir->i_ino,
-               (int)b->b.fileaddr, (unsigned)hash);
+       dprintk("HANDLE ORPHAN h=%x %s\n", (unsigned)hash, strblk(&b->b));
        err = lafs_read_block(b);
        if (err)
                goto abort;

diff --git a/index.c b/index.c
index ad4e0509b20024761c894813cc090706194f9b93..5caa8926fc0cb013cf2654f34a3b382ae7379b36 100644 (file)
--- a/index.c
+++ b/index.c
@@ -404,8 +404,7 @@ void lafs_phase_flip(struct fs *fs, struct block *b)
        int oldphase = !!test_bit(B_Phase1, &b->flags);
        struct block *ulist;
 
-       dprintk("FLIP %d/%d %d->%d\n", (int)b->inode->i_ino,
-               (int)b->fileaddr, oldphase, fs->phase);
+       dprintk("FLIP %s\n", strblk(b));
 
        BUG_ON(!test_bit(B_Pinned, &b->flags));
        BUG_ON(!test_bit(B_Index, &b->flags));

diff --git a/lafs.h b/lafs.h
index d80232c78e5db1e7d21730b6e638a1b9dc274a15..b6a7dc1251bc23311ed91486d9506da08666a263 100644 (file)
--- a/lafs.h
+++ b/lafs.h
@@ -311,8 +311,7 @@ static inline struct fs *fs_from_inode(struct inode *ino)
 static inline int set_phase(struct block *b, int ph)
 {
        if (b->inode->i_ino == 0 && b->fileaddr == 0)
-               dprintk("SETPHASE %d/%d %d\n", (int)b->inode->i_ino,
-                       (int)b->fileaddr, ph);
+               dprintk("SETPHASE %s to  %d\n", strblk(b), ph);
        if (ph)
                set_bit(B_Phase1, &b->flags);
        else