rename funcs and structs to btrfs

[linux-2.6-block.git] / fs / btrfs / mkfs.c

diff --git a/fs/btrfs/mkfs.c b/fs/btrfs/mkfs.c
index fd4e5dea7e1b052a8c85cf0b70a96ce008ec926f..fc1923320de34a0ba541e642b2b740c18a28a55b 100644 (file)
--- a/fs/btrfs/mkfs.c
+++ b/fs/btrfs/mkfs.c
@@ -12,10 +12,10 @@
 
 int mkfs(int fd)
 {
-       struct ctree_root_info info[2];
-       struct leaf empty_leaf;
-       struct item item;
-       struct extent_item extent_item;
+       struct btrfs_root_info info[2];
+       struct btrfs_leaf empty_leaf;
+       struct btrfs_item item;
+       struct btrfs_extent_item extent_item;
        int ret;
 
        /* setup the super block area */
@@ -28,49 +28,55 @@ int mkfs(int fd)
        info[1].objectid = 2;
        info[1].tree_root = 18;
        ret = pwrite(fd, info, sizeof(info),
-                    CTREE_SUPER_INFO_OFFSET(CTREE_BLOCKSIZE));
+                    BTRFS_SUPER_INFO_OFFSET(BTRFS_BLOCKSIZE));
        if (ret != sizeof(info))
                return -1;
 
        /* create leaves for the tree root and extent root */
        memset(&empty_leaf, 0, sizeof(empty_leaf));
-       empty_leaf.header.parentid = 1;
-       empty_leaf.header.blocknr = 17;
-       ret = pwrite(fd, &empty_leaf, sizeof(empty_leaf), 17 * CTREE_BLOCKSIZE);
+       btrfs_set_header_parentid(&empty_leaf.header, 1);
+       btrfs_set_header_blocknr(&empty_leaf.header, 17);
+       ret = pwrite(fd, &empty_leaf, sizeof(empty_leaf), 17 * BTRFS_BLOCKSIZE);
        if (ret != sizeof(empty_leaf))
                return -1;
 
-       empty_leaf.header.parentid = 2;
-       empty_leaf.header.blocknr = 18;
-       empty_leaf.header.nritems = 3;
+       btrfs_set_header_parentid(&empty_leaf.header, 2);
+       btrfs_set_header_blocknr(&empty_leaf.header, 18);
+       btrfs_set_header_nritems(&empty_leaf.header, 3);
 
        /* item1, reserve blocks 0-16 */
-       item.key.objectid = 0;
-       item.key.offset = 17;
-       item.key.flags = 0;
-       item.offset = LEAF_DATA_SIZE - sizeof(struct extent_item);
-       item.size = sizeof(struct extent_item);
-       extent_item.refs = 1;
-       extent_item.owner = 0;
+       btrfs_set_key_objectid(&item.key, 0);
+       btrfs_set_key_offset(&item.key, 17);
+       btrfs_set_key_flags(&item.key, 0);
+       btrfs_set_item_offset(&item, LEAF_DATA_SIZE -
+                             sizeof(struct btrfs_extent_item));
+       btrfs_set_item_size(&item, sizeof(struct btrfs_extent_item));
+       btrfs_set_extent_refs(&extent_item, 1);
+       btrfs_set_extent_owner(&extent_item, 0);
        memcpy(empty_leaf.items, &item, sizeof(item));
-       memcpy(empty_leaf.data + item.offset, &extent_item, item.size);
+       memcpy(empty_leaf.data + btrfs_item_offset(&item), &extent_item,
+               btrfs_item_size(&item));
 
        /* item2, give block 17 to the root */
-       item.key.objectid = 17;
-       item.key.offset = 1;
-       item.offset = LEAF_DATA_SIZE - sizeof(struct extent_item) * 2;
-       extent_item.owner = 1;
+       btrfs_set_key_objectid(&item.key, 17);
+       btrfs_set_key_offset(&item.key, 1);
+       btrfs_set_item_offset(&item, LEAF_DATA_SIZE -
+                             sizeof(struct btrfs_extent_item) * 2);
+       btrfs_set_extent_owner(&extent_item, 1);
        memcpy(empty_leaf.items + 1, &item, sizeof(item));
-       memcpy(empty_leaf.data + item.offset, &extent_item, item.size);
+       memcpy(empty_leaf.data + btrfs_item_offset(&item), &extent_item,
+               btrfs_item_size(&item));
 
        /* item3, give block 18 for the extent root */
-       item.key.objectid = 18;
-       item.key.offset = 1;
-       item.offset = LEAF_DATA_SIZE - sizeof(struct extent_item) * 3;
-       extent_item.owner = 2;
+       btrfs_set_key_objectid(&item.key, 18);
+       btrfs_set_key_offset(&item.key, 1);
+       btrfs_set_item_offset(&item, LEAF_DATA_SIZE -
+                             sizeof(struct btrfs_extent_item) * 3);
+       btrfs_set_extent_owner(&extent_item, 2);
        memcpy(empty_leaf.items + 2, &item, sizeof(item));
-       memcpy(empty_leaf.data + item.offset, &extent_item, item.size);
-       ret = pwrite(fd, &empty_leaf, sizeof(empty_leaf), 18 * CTREE_BLOCKSIZE);
+       memcpy(empty_leaf.data + btrfs_item_offset(&item), &extent_item,
+               btrfs_item_size(&item));
+       ret = pwrite(fd, &empty_leaf, sizeof(empty_leaf), 18 * BTRFS_BLOCKSIZE);
        if (ret != sizeof(empty_leaf))
                return -1;
        return 0;