Btrfs: reorder key offset and flags
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/TODO b/fs/btrfs/TODO
index ff90e5e..8142be8 100644
--- a/fs/btrfs/TODO
+++ b/fs/btrfs/TODO
@@ -1,7 +1,6 @@
* cleanup, add more error checking, get rid of BUG_ONs
* Make IO functions look more like the page cache
* Fix ENOSPC handling
-* make blocksize a mkfs parameter instead of #define
* make a real mkfs and superblock
* Do checksumming
* Define FS objects in terms of different item types
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index c61ad0f..73ebc82 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -26,14 +26,14 @@
*/
struct btrfs_disk_key {
__le64 objectid;
- __le32 flags;
__le64 offset;
+ __le32 flags;
} __attribute__ ((__packed__));
struct btrfs_key {
u64 objectid;
- u32 flags;
u64 offset;
+ u32 flags;
} __attribute__ ((__packed__));
/*
diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 7a189ea..4c71019 100644
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -18,11 +18,11 @@
fflush(stdout);
for (i = 0 ; i < nr ; i++) {
item = l->items + i;
- printf("\titem %d key (%Lu %u %Lu) itemoff %d itemsize %d\n",
+ printf("\titem %d key (%Lu %Lu %u) itemoff %d itemsize %d\n",
i,
btrfs_key_objectid(&item->key),
- btrfs_key_flags(&item->key),
btrfs_key_offset(&item->key),
+ btrfs_key_flags(&item->key),
btrfs_item_offset(item),
btrfs_item_size(item));
printf("\t\titem data %.*s\n", btrfs_item_size(item),
@@ -55,10 +55,12 @@
(u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
fflush(stdout);
for (i = 0; i < nr; i++) {
- printf("\tkey %d (%Lu %u %Lu) block %Lu\n",
+ printf("\tkey %d (%Lu %Lu %u) block %Lu\n",
i,
- c->ptrs[i].key.objectid, c->ptrs[i].key.flags,
- c->ptrs[i].key.offset, btrfs_node_blockptr(c, i));
+ c->ptrs[i].key.objectid,
+ c->ptrs[i].key.offset,
+ c->ptrs[i].key.flags,
+ btrfs_node_blockptr(c, i));
fflush(stdout);
}
for (i = 0; i < nr; i++) {
