Btrfs: printk fixes

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 96bf3ef3a798f17f42c551ff23ecc226a2c0e406..878101172546370e437783f4cc770b993109ad4b 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -20,8 +20,9 @@ static int check_tree_block(struct btrfs_root *root, struct buffer_head *buf)
 {
        struct btrfs_node *node = btrfs_buffer_node(buf);
        if (bh_blocknr(buf) != btrfs_header_blocknr(&node->header)) {
-               printk(KERN_CRIT "bh_blocknr(buf) is %Lu, header is %Lu\n",
-                      bh_blocknr(buf), btrfs_header_blocknr(&node->header));
+               printk(KERN_CRIT "bh_blocknr(buf) is %llu, header is %llu\n",
+                      (unsigned long long)bh_blocknr(buf),
+                      (unsigned long long)btrfs_header_blocknr(&node->header));
                return 1;
        }
        return 0;
@@ -157,8 +158,9 @@ static int csum_tree_block(struct btrfs_root *root, struct buffer_head *bh,
                return ret;
        if (verify) {
                if (memcmp(bh->b_data, result, BTRFS_CRC32_SIZE)) {
-                       printk("checksum verify failed on %Lu\n",
-                              bh_blocknr(bh));
+                       printk("btrfs: %s checksum verify failed on %llu\n",
+                              root->fs_info->sb->s_id,
+                              (unsigned long long)bh_blocknr(bh));
                        return 1;
                }
        } else {

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 6949eebc9dc1813da6280b31a0cbb0e6db603b70..fe02fbfa6d59a745dd2b4f5a6be326553cd99217 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -584,8 +584,6 @@ static int update_block_group(struct btrfs_trans_handle *trans,
        while(total) {
                cache = btrfs_lookup_block_group(info, blocknr);
                if (!cache) {
-                       printk(KERN_CRIT "blocknr %Lu lookup failed\n",
-                              blocknr);
                        return -1;
                }
                block_in_group = blocknr - cache->key.objectid;
@@ -795,9 +793,6 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
 
        ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);
        if (ret) {
-               printk("failed to find %Lu\n", key.objectid);
-               btrfs_print_tree(extent_root, extent_root->node);
-               printk("failed to find %Lu\n", key.objectid);
                BUG();
        }
        ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index fb8c214160c189fc431cead53a5d3455d6d897bd..d5a98827e38aca1ed219a1b2dceb2b8ade74209a 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -28,10 +28,6 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
 
        ret = btrfs_insert_empty_item(trans, root, path, &file_key,
                                      sizeof(*item));
-       if (ret) {
-printk("failed to insert %Lu %Lu ret %d\n", objectid, pos, ret);
-btrfs_print_leaf(root, btrfs_buffer_leaf(path->nodes[0]));
-       }
        BUG_ON(ret);
        item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                              struct btrfs_file_extent_item);
@@ -201,7 +197,6 @@ insert:
        ret = btrfs_insert_empty_item(trans, root, path, &file_key,
                                      BTRFS_CRC32_SIZE);
        if (ret != 0) {
-               printk("at insert for %Lu %u %Lu ret is %d\n", file_key.objectid, file_key.flags, file_key.offset, ret);
                WARN_ON(1);
                goto fail;
        }

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 28813411de66bafacbfd999c03dbaa274c2d547f..21791f03756148be340407d9b8f321466b274483 100644 (file)
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -15,31 +15,32 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
        struct btrfs_block_group_item *bi;
        u32 type;
 
-       printk("leaf %Lu total ptrs %d free space %d\n",
-               btrfs_header_blocknr(&l->header), nr,
+       printk("leaf %llu total ptrs %d free space %d\n",
+               (unsigned long long)btrfs_header_blocknr(&l->header), nr,
                btrfs_leaf_free_space(root, l));
        for (i = 0 ; i < nr ; i++) {
                item = l->items + i;
                type = btrfs_disk_key_type(&item->key);
-               printk("\titem %d key (%Lu %x %Lu) itemoff %d itemsize %d\n",
+               printk("\titem %d key (%llu %x %llu) itemoff %d itemsize %d\n",
                        i,
-                       btrfs_disk_key_objectid(&item->key),
+                       (unsigned long long)btrfs_disk_key_objectid(&item->key),
                        btrfs_disk_key_flags(&item->key),
-                       btrfs_disk_key_offset(&item->key),
+                       (unsigned long long)btrfs_disk_key_offset(&item->key),
                        btrfs_item_offset(item),
                        btrfs_item_size(item));
                switch (type) {
                case BTRFS_INODE_ITEM_KEY:
                        ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);
-                       printk("\t\tinode generation %Lu size %Lu mode %o\n",
-                              btrfs_inode_generation(ii),
-                              btrfs_inode_size(ii),
+                       printk("\t\tinode generation %llu size %llu mode %o\n",
+                              (unsigned long long)btrfs_inode_generation(ii),
+                              (unsigned long long)btrfs_inode_size(ii),
                               btrfs_inode_mode(ii));
                        break;
                case BTRFS_DIR_ITEM_KEY:
                        di = btrfs_item_ptr(l, i, struct btrfs_dir_item);
-                       printk("\t\tdir oid %Lu flags %u type %u\n",
-                               btrfs_disk_key_objectid(&di->location),
+                       printk("\t\tdir oid %llu flags %u type %u\n",
+                               (unsigned long long)btrfs_disk_key_objectid(
+                                                           &di->location),
                                btrfs_dir_flags(di),
                                btrfs_dir_type(di));
                        printk("\t\tname %.*s\n",
@@ -47,8 +48,9 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
                        break;
                case BTRFS_ROOT_ITEM_KEY:
                        ri = btrfs_item_ptr(l, i, struct btrfs_root_item);
-                       printk("\t\troot data blocknr %Lu refs %u\n",
-                               btrfs_root_blocknr(ri), btrfs_root_refs(ri));
+                       printk("\t\troot data blocknr %llu refs %u\n",
+                               (unsigned long long)btrfs_root_blocknr(ri),
+                               btrfs_root_refs(ri));
                        break;
                case BTRFS_EXTENT_ITEM_KEY:
                        ei = btrfs_item_ptr(l, i, struct btrfs_extent_item);
@@ -58,8 +60,8 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
                case BTRFS_BLOCK_GROUP_ITEM_KEY:
                        bi = btrfs_item_ptr(l, i,
                                            struct btrfs_block_group_item);
-                       printk("\t\tblock group used %Lu\n",
-                              btrfs_block_group_used(bi));
+                       printk("\t\tblock group used %llu\n",
+                              (unsigned long long)btrfs_block_group_used(bi));
                        break;
                case BTRFS_STRING_ITEM_KEY:
                        printk("\t\titem data %.*s\n", btrfs_item_size(item),
@@ -83,17 +85,17 @@ void btrfs_print_tree(struct btrfs_root *root, struct buffer_head *t)
                btrfs_print_leaf(root, (struct btrfs_leaf *)c);
                return;
        }
-       printk("node %Lu level %d total ptrs %d free spc %u\n",
-              btrfs_header_blocknr(&c->header),
+       printk("node %llu level %d total ptrs %d free spc %u\n",
+              (unsigned long long)btrfs_header_blocknr(&c->header),
               btrfs_header_level(&c->header), nr,
               (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
        for (i = 0; i < nr; i++) {
-               printk("\tkey %d (%Lu %u %Lu) block %Lu\n",
+               printk("\tkey %d (%llu %u %llu) block %llu\n",
                       i,
-                      c->ptrs[i].key.objectid,
+                      (unsigned long long)c->ptrs[i].key.objectid,
                       c->ptrs[i].key.flags,
-                      c->ptrs[i].key.offset,
-                      btrfs_node_blockptr(c, i));
+                      (unsigned long long)c->ptrs[i].key.offset,
+                      (unsigned long long)btrfs_node_blockptr(c, i));
        }
        for (i = 0; i < nr; i++) {
                struct buffer_head *next_buf = read_tree_block(root,

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 0564a73bb2e2457c7cca4eaefd28f3db1cb50070..13c30284fd84aa9659a4fb8aaa7f42a168e3d8f8 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -102,7 +102,7 @@ int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                ret = btrfs_del_item(trans, root, path);
        } else {
                btrfs_set_root_refs(ri, refs - 1);
-printk("ref now %u root %llu %Lu %u\n", refs -1, key->objectid, key->offset, key->flags);
+               WARN_ON(1);
                mark_buffer_dirty(path->nodes[0]);
        }
 out: