Btrfs: printk fixes

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

Btrfs: printk fixes
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Chris Mason · David Woodhouse
1 parent 84f54cfa78
Showing 5 changed files with 29 additions and 35 deletions Side-by-side Diff
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/file-item.c
fs/btrfs/print-tree.c
fs/btrfs/root-tree.c
@@ -20,8 +20,9 @@
 {
 	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 @@
 		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 {
@@ -584,8 +584,6 @@
 	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 @@
  
 	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],
@@ -28,10 +28,6 @@
  
 	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 @@
 	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;
 	}
@@ -15,31 +15,32 @@
 	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 @@
 			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 @@
 		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 @@
 		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,
@@ -102,7 +102,7 @@
 		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:
...	...	@@ -20,8 +20,9 @@
20	20	{
21	21	struct btrfs_node *node = btrfs_buffer_node(buf);
22	22	if (bh_blocknr(buf) != btrfs_header_blocknr(&node->header)) {
23		- printk(KERN_CRIT "bh_blocknr(buf) is %Lu, header is %Lu\n",
24		- bh_blocknr(buf), btrfs_header_blocknr(&node->header));
	23	+ printk(KERN_CRIT "bh_blocknr(buf) is %llu, header is %llu\n",
	24	+ (unsigned long long)bh_blocknr(buf),
	25	+ (unsigned long long)btrfs_header_blocknr(&node->header));
25	26	return 1;
26	27	}
27	28	return 0;
...	...	@@ -157,8 +158,9 @@
157	158	return ret;
158	159	if (verify) {
159	160	if (memcmp(bh->b_data, result, BTRFS_CRC32_SIZE)) {
160		- printk("checksum verify failed on %Lu\n",
161		- bh_blocknr(bh));
	161	+ printk("btrfs: %s checksum verify failed on %llu\n",
	162	+ root->fs_info->sb->s_id,
	163	+ (unsigned long long)bh_blocknr(bh));
162	164	return 1;
163	165	}
164	166	} else {
...	...	@@ -584,8 +584,6 @@
584	584	while(total) {
585	585	cache = btrfs_lookup_block_group(info, blocknr);
586	586	if (!cache) {
587		- printk(KERN_CRIT "blocknr %Lu lookup failed\n",
588		- blocknr);
589	587	return -1;
590	588	}
591	589	block_in_group = blocknr - cache->key.objectid;
...	...	@@ -795,9 +793,6 @@
795	793
796	794	ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);
797	795	if (ret) {
798		- printk("failed to find %Lu\n", key.objectid);
799		- btrfs_print_tree(extent_root, extent_root->node);
800		- printk("failed to find %Lu\n", key.objectid);
801	796	BUG();
802	797	}
803	798	ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
...	...	@@ -28,10 +28,6 @@
28	28
29	29	ret = btrfs_insert_empty_item(trans, root, path, &file_key,
30	30	sizeof(*item));
31		- if (ret) {
32		-printk("failed to insert %Lu %Lu ret %d\n", objectid, pos, ret);
33		-btrfs_print_leaf(root, btrfs_buffer_leaf(path->nodes[0]));
34		- }
35	31	BUG_ON(ret);
36	32	item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
37	33	struct btrfs_file_extent_item);
...	...	@@ -201,7 +197,6 @@
201	197	ret = btrfs_insert_empty_item(trans, root, path, &file_key,
202	198	BTRFS_CRC32_SIZE);
203	199	if (ret != 0) {
204		- printk("at insert for %Lu %u %Lu ret is %d\n", file_key.objectid, file_key.flags, file_key.offset, ret);
205	200	WARN_ON(1);
206	201	goto fail;
207	202	}
...	...	@@ -15,31 +15,32 @@
15	15	struct btrfs_block_group_item *bi;
16	16	u32 type;
17	17
18		- printk("leaf %Lu total ptrs %d free space %d\n",
19		- btrfs_header_blocknr(&l->header), nr,
	18	+ printk("leaf %llu total ptrs %d free space %d\n",
	19	+ (unsigned long long)btrfs_header_blocknr(&l->header), nr,
20	20	btrfs_leaf_free_space(root, l));
21	21	for (i = 0 ; i < nr ; i++) {
22	22	item = l->items + i;
23	23	type = btrfs_disk_key_type(&item->key);
24		- printk("\titem %d key (%Lu %x %Lu) itemoff %d itemsize %d\n",
	24	+ printk("\titem %d key (%llu %x %llu) itemoff %d itemsize %d\n",
25	25	i,
26		- btrfs_disk_key_objectid(&item->key),
	26	+ (unsigned long long)btrfs_disk_key_objectid(&item->key),
27	27	btrfs_disk_key_flags(&item->key),
28		- btrfs_disk_key_offset(&item->key),
	28	+ (unsigned long long)btrfs_disk_key_offset(&item->key),
29	29	btrfs_item_offset(item),
30	30	btrfs_item_size(item));
31	31	switch (type) {
32	32	case BTRFS_INODE_ITEM_KEY:
33	33	ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);
34		- printk("\t\tinode generation %Lu size %Lu mode %o\n",
35		- btrfs_inode_generation(ii),
36		- btrfs_inode_size(ii),
	34	+ printk("\t\tinode generation %llu size %llu mode %o\n",
	35	+ (unsigned long long)btrfs_inode_generation(ii),
	36	+ (unsigned long long)btrfs_inode_size(ii),
37	37	btrfs_inode_mode(ii));
38	38	break;
39	39	case BTRFS_DIR_ITEM_KEY:
40	40	di = btrfs_item_ptr(l, i, struct btrfs_dir_item);
41		- printk("\t\tdir oid %Lu flags %u type %u\n",
42		- btrfs_disk_key_objectid(&di->location),
	41	+ printk("\t\tdir oid %llu flags %u type %u\n",
	42	+ (unsigned long long)btrfs_disk_key_objectid(
	43	+ &di->location),
43	44	btrfs_dir_flags(di),
44	45	btrfs_dir_type(di));
45	46	printk("\t\tname %.*s\n",
...	...	@@ -47,8 +48,9 @@
47	48	break;
48	49	case BTRFS_ROOT_ITEM_KEY:
49	50	ri = btrfs_item_ptr(l, i, struct btrfs_root_item);
50		- printk("\t\troot data blocknr %Lu refs %u\n",
51		- btrfs_root_blocknr(ri), btrfs_root_refs(ri));
	51	+ printk("\t\troot data blocknr %llu refs %u\n",
	52	+ (unsigned long long)btrfs_root_blocknr(ri),
	53	+ btrfs_root_refs(ri));
52	54	break;
53	55	case BTRFS_EXTENT_ITEM_KEY:
54	56	ei = btrfs_item_ptr(l, i, struct btrfs_extent_item);
...	...	@@ -58,8 +60,8 @@
58	60	case BTRFS_BLOCK_GROUP_ITEM_KEY:
59	61	bi = btrfs_item_ptr(l, i,
60	62	struct btrfs_block_group_item);
61		- printk("\t\tblock group used %Lu\n",
62		- btrfs_block_group_used(bi));
	63	+ printk("\t\tblock group used %llu\n",
	64	+ (unsigned long long)btrfs_block_group_used(bi));
63	65	break;
64	66	case BTRFS_STRING_ITEM_KEY:
65	67	printk("\t\titem data %.*s\n", btrfs_item_size(item),
66	68
67	69
68	70
...	...	@@ -83,17 +85,17 @@
83	85	btrfs_print_leaf(root, (struct btrfs_leaf *)c);
84	86	return;
85	87	}
86		- printk("node %Lu level %d total ptrs %d free spc %u\n",
87		- btrfs_header_blocknr(&c->header),
	88	+ printk("node %llu level %d total ptrs %d free spc %u\n",
	89	+ (unsigned long long)btrfs_header_blocknr(&c->header),
88	90	btrfs_header_level(&c->header), nr,
89	91	(u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
90	92	for (i = 0; i < nr; i++) {
91		- printk("\tkey %d (%Lu %u %Lu) block %Lu\n",
	93	+ printk("\tkey %d (%llu %u %llu) block %llu\n",
92	94	i,
93		- c->ptrs[i].key.objectid,
	95	+ (unsigned long long)c->ptrs[i].key.objectid,
94	96	c->ptrs[i].key.flags,
95		- c->ptrs[i].key.offset,
96		- btrfs_node_blockptr(c, i));
	97	+ (unsigned long long)c->ptrs[i].key.offset,
	98	+ (unsigned long long)btrfs_node_blockptr(c, i));
97	99	}
98	100	for (i = 0; i < nr; i++) {
99	101	struct buffer_head *next_buf = read_tree_block(root,
...	...	@@ -102,7 +102,7 @@
102	102	ret = btrfs_del_item(trans, root, path);
103	103	} else {
104	104	btrfs_set_root_refs(ri, refs - 1);
105		-printk("ref now %u root %llu %Lu %u\n", refs -1, key->objectid, key->offset, key->flags);
	105	+ WARN_ON(1);
106	106	mark_buffer_dirty(path->nodes[0]);
107	107	}
108	108	out: