-#define _XOPEN_SOURCE 500
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include "kerncompat.h"
-#include "radix-tree.h"
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/blkdev.h>
+#include <linux/crypto.h>
+#include <linux/scatterlist.h>
+#include <linux/swap.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
-static int allocated_blocks = 0;
-int cache_max = 10000;
-
-static int check_tree_block(struct btrfs_root *root, struct btrfs_buffer *buf)
+static int check_tree_block(struct btrfs_root *root, struct buffer_head *buf)
{
- if (buf->blocknr != btrfs_header_blocknr(&buf->node.header))
+ struct btrfs_node *node = btrfs_buffer_node(buf);
+ if (buf->b_blocknr != btrfs_header_blocknr(&node->header)) {
BUG();
- if (root->node && btrfs_header_parentid(&buf->node.header) !=
- btrfs_header_parentid(&root->node->node.header))
+ }
+ if (root->node && btrfs_header_parentid(&node->header) !=
+ btrfs_header_parentid(btrfs_buffer_header(root->node))) {
BUG();
- return 0;
-}
-
-static int free_some_buffers(struct btrfs_root *root)
-{
- struct list_head *node, *next;
- struct btrfs_buffer *b;
- if (root->cache_size < cache_max)
- return 0;
- list_for_each_safe(node, next, &root->cache) {
- b = list_entry(node, struct btrfs_buffer, cache);
- if (b->count == 1) {
- BUG_ON(!list_empty(&b->dirty));
- list_del_init(&b->cache);
- btrfs_block_release(root, b);
- if (root->cache_size < cache_max)
- break;
- }
}
return 0;
}
-struct btrfs_buffer *alloc_tree_block(struct btrfs_root *root, u64 blocknr)
+struct buffer_head *btrfs_find_tree_block(struct btrfs_root *root, u64 blocknr)
{
- struct btrfs_buffer *buf;
- int ret;
+ return sb_find_get_block(root->fs_info->sb, blocknr);
+#if 0
+ struct address_space *mapping = root->fs_info->btree_inode->i_mapping;
+ int blockbits = root->fs_info->sb->s_blocksize_bits;
+ unsigned long index = blocknr >> (PAGE_CACHE_SHIFT - blockbits);
+ struct page *page;
+ struct buffer_head *bh;
+ struct buffer_head *head;
+ struct buffer_head *ret = NULL;
+
+
+ page = find_lock_page(mapping, index);
+ if (!page)
+ return NULL;
+
+ if (!page_has_buffers(page))
+ goto out_unlock;
- buf = malloc(sizeof(struct btrfs_buffer) + root->blocksize);
- if (!buf)
- return buf;
- allocated_blocks++;
- buf->blocknr = blocknr;
- buf->count = 2;
- INIT_LIST_HEAD(&buf->dirty);
- free_some_buffers(root);
- radix_tree_preload(GFP_KERNEL);
- ret = radix_tree_insert(&root->cache_radix, blocknr, buf);
- radix_tree_preload_end();
- list_add_tail(&buf->cache, &root->cache);
- root->cache_size++;
+ head = page_buffers(page);
+ bh = head;
+ do {
+ if (buffer_mapped(bh) && bh->b_blocknr == blocknr) {
+ ret = bh;
+ get_bh(bh);
+ goto out_unlock;
+ }
+ bh = bh->b_this_page;
+ } while (bh != head);
+out_unlock:
+ unlock_page(page);
if (ret) {
- free(buf);
- return NULL;
+ touch_buffer(ret);
}
- return buf;
+ page_cache_release(page);
+ return ret;
+#endif
}
-struct btrfs_buffer *find_tree_block(struct btrfs_root *root, u64 blocknr)
+struct buffer_head *btrfs_find_create_tree_block(struct btrfs_root *root,
+ u64 blocknr)
{
- struct btrfs_buffer *buf;
- buf = radix_tree_lookup(&root->cache_radix, blocknr);
- if (buf) {
- buf->count++;
- } else {
- buf = alloc_tree_block(root, blocknr);
- if (!buf) {
- BUG();
- return NULL;
+ return sb_getblk(root->fs_info->sb, blocknr);
+#if 0
+ struct address_space *mapping = root->fs_info->btree_inode->i_mapping;
+ int blockbits = root->fs_info->sb->s_blocksize_bits;
+ unsigned long index = blocknr >> (PAGE_CACHE_SHIFT - blockbits);
+ struct page *page;
+ struct buffer_head *bh;
+ struct buffer_head *head;
+ struct buffer_head *ret = NULL;
+ u64 first_block = index << (PAGE_CACHE_SHIFT - blockbits);
+
+ page = grab_cache_page(mapping, index);
+ if (!page)
+ return NULL;
+
+ if (!page_has_buffers(page))
+ create_empty_buffers(page, root->fs_info->sb->s_blocksize, 0);
+ head = page_buffers(page);
+ bh = head;
+ do {
+ if (!buffer_mapped(bh)) {
+ bh->b_bdev = root->fs_info->sb->s_bdev;
+ bh->b_blocknr = first_block;
+ set_buffer_mapped(bh);
}
- }
- return buf;
+ if (bh->b_blocknr == blocknr) {
+ ret = bh;
+ get_bh(bh);
+ goto out_unlock;
+ }
+ bh = bh->b_this_page;
+ first_block++;
+ } while (bh != head);
+out_unlock:
+ unlock_page(page);
+ if (ret)
+ touch_buffer(ret);
+ page_cache_release(page);
+ return ret;
+#endif
}
-struct btrfs_buffer *read_tree_block(struct btrfs_root *root, u64 blocknr)
+static sector_t max_block(struct block_device *bdev)
{
- loff_t offset = blocknr * root->blocksize;
- struct btrfs_buffer *buf;
- int ret;
+ sector_t retval = ~((sector_t)0);
+ loff_t sz = i_size_read(bdev->bd_inode);
- buf = radix_tree_lookup(&root->cache_radix, blocknr);
- if (buf) {
- buf->count++;
- } else {
- buf = alloc_tree_block(root, blocknr);
- if (!buf)
- return NULL;
- ret = pread(root->fp, &buf->node, root->blocksize, offset);
- if (ret != root->blocksize) {
- free(buf);
- return NULL;
- }
+ if (sz) {
+ unsigned int size = block_size(bdev);
+ unsigned int sizebits = blksize_bits(size);
+ retval = (sz >> sizebits);
}
- if (check_tree_block(root, buf))
- BUG();
- return buf;
+ return retval;
}
-int dirty_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
- struct btrfs_buffer *buf)
+static int btree_get_block(struct inode *inode, sector_t iblock,
+ struct buffer_head *bh, int create)
{
- if (!list_empty(&buf->dirty))
+ if (iblock >= max_block(inode->i_sb->s_bdev)) {
+ if (create)
+ return -EIO;
+
+ /*
+ * for reads, we're just trying to fill a partial page.
+ * return a hole, they will have to call get_block again
+ * before they can fill it, and they will get -EIO at that
+ * time
+ */
return 0;
- list_add_tail(&buf->dirty, &root->trans);
- buf->count++;
+ }
+ bh->b_bdev = inode->i_sb->s_bdev;
+ bh->b_blocknr = iblock;
+ set_buffer_mapped(bh);
return 0;
}
-int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
- struct btrfs_buffer *buf)
+int btrfs_csum_data(struct btrfs_root * root, char *data, size_t len,
+ char *result)
{
- if (!list_empty(&buf->dirty)) {
- list_del_init(&buf->dirty);
- btrfs_block_release(root, buf);
+ struct scatterlist sg;
+ struct crypto_hash *tfm = root->fs_info->hash_tfm;
+ struct hash_desc desc;
+ int ret;
+
+ desc.tfm = tfm;
+ desc.flags = 0;
+ sg_init_one(&sg, data, len);
+ spin_lock(&root->fs_info->hash_lock);
+ ret = crypto_hash_digest(&desc, &sg, 1, result);
+ spin_unlock(&root->fs_info->hash_lock);
+ if (ret) {
+ printk("sha256 digest failed\n");
}
- return 0;
+ return ret;
}
-
-int write_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
- struct btrfs_buffer *buf)
+static int csum_tree_block(struct btrfs_root *root, struct buffer_head *bh,
+ int verify)
{
- u64 blocknr = buf->blocknr;
- loff_t offset = blocknr * root->blocksize;
+ char result[BTRFS_CSUM_SIZE];
int ret;
+ struct btrfs_node *node;
- if (buf->blocknr != btrfs_header_blocknr(&buf->node.header))
- BUG();
- ret = pwrite(root->fp, &buf->node, root->blocksize, offset);
- if (ret != root->blocksize)
+ return 0;
+ ret = btrfs_csum_data(root, bh->b_data + BTRFS_CSUM_SIZE,
+ bh->b_size - BTRFS_CSUM_SIZE, result);
+ if (ret)
return ret;
+ if (verify) {
+ if (memcmp(bh->b_data, result, BTRFS_CSUM_SIZE)) {
+ printk("checksum verify failed on %lu\n",
+ bh->b_blocknr);
+ return 1;
+ }
+ } else {
+ node = btrfs_buffer_node(bh);
+ memcpy(node->header.csum, result, BTRFS_CSUM_SIZE);
+ }
return 0;
}
-static int __commit_transaction(struct btrfs_trans_handle *trans, struct
- btrfs_root *root)
+static int btree_writepage(struct page *page, struct writeback_control *wbc)
{
- struct btrfs_buffer *b;
- int ret = 0;
- int wret;
- while(!list_empty(&root->trans)) {
- b = list_entry(root->trans.next, struct btrfs_buffer, dirty);
- list_del_init(&b->dirty);
- wret = write_tree_block(trans, root, b);
- if (wret)
- ret = wret;
- btrfs_block_release(root, b);
+#if 0
+ struct buffer_head *bh;
+ struct btrfs_root *root = btrfs_sb(page->mapping->host->i_sb);
+ struct buffer_head *head;
+ if (!page_has_buffers(page)) {
+ create_empty_buffers(page, root->fs_info->sb->s_blocksize,
+ (1 << BH_Dirty)|(1 << BH_Uptodate));
}
- return ret;
+ head = page_buffers(page);
+ bh = head;
+ do {
+ if (buffer_dirty(bh))
+ csum_tree_block(root, bh, 0);
+ bh = bh->b_this_page;
+ } while (bh != head);
+#endif
+ return block_write_full_page(page, btree_get_block, wbc);
}
-static int commit_extent_and_tree_roots(struct btrfs_trans_handle *trans,
- struct btrfs_root *tree_root, struct
- btrfs_root *extent_root)
+static int btree_readpage(struct file * file, struct page * page)
{
- int ret;
- u64 old_extent_block;
-
- while(1) {
- old_extent_block = btrfs_root_blocknr(&extent_root->root_item);
- if (old_extent_block == extent_root->node->blocknr)
- break;
- btrfs_set_root_blocknr(&extent_root->root_item,
- extent_root->node->blocknr);
- ret = btrfs_update_root(trans, tree_root,
- &extent_root->root_key,
- &extent_root->root_item);
- BUG_ON(ret);
- }
- __commit_transaction(trans, extent_root);
- __commit_transaction(trans, tree_root);
- return 0;
+ return block_read_full_page(page, btree_get_block);
}
-int btrfs_commit_transaction(struct btrfs_trans_handle *trans, struct
- btrfs_root *root, struct btrfs_super_block *s)
-{
- int ret = 0;
- struct btrfs_buffer *snap = root->commit_root;
- struct btrfs_key snap_key;
-
- ret = __commit_transaction(trans, root);
- BUG_ON(ret);
-
- if (root->commit_root == root->node)
- return 0;
-
- memcpy(&snap_key, &root->root_key, sizeof(snap_key));
- root->root_key.offset++;
+static struct address_space_operations btree_aops = {
+ .readpage = btree_readpage,
+ .writepage = btree_writepage,
+ .sync_page = block_sync_page,
+};
- btrfs_set_root_blocknr(&root->root_item, root->node->blocknr);
- ret = btrfs_insert_root(trans, root->tree_root, &root->root_key,
- &root->root_item);
- BUG_ON(ret);
-
- ret = commit_extent_and_tree_roots(trans, root->tree_root,
- root->extent_root);
- BUG_ON(ret);
-
- write_ctree_super(trans, root, s);
- btrfs_finish_extent_commit(trans, root->extent_root);
- btrfs_finish_extent_commit(trans, root->tree_root);
+struct buffer_head *read_tree_block(struct btrfs_root *root, u64 blocknr)
+{
+ return sb_bread(root->fs_info->sb, blocknr);
+#if 0
+ struct buffer_head *bh = NULL;
+
+ bh = btrfs_find_create_tree_block(root, blocknr);
+ if (!bh)
+ return bh;
+ lock_buffer(bh);
+ if (!buffer_uptodate(bh)) {
+ get_bh(bh);
+ bh->b_end_io = end_buffer_read_sync;
+ submit_bh(READ, bh);
+ wait_on_buffer(bh);
+ if (!buffer_uptodate(bh))
+ goto fail;
+ csum_tree_block(root, bh, 1);
+ } else {
+ unlock_buffer(bh);
+ }
+ if (check_tree_block(root, bh))
+ BUG();
+ return bh;
+fail:
+ brelse(bh);
+ return NULL;
- root->commit_root = root->node;
- root->node->count++;
- ret = btrfs_drop_snapshot(trans, root, snap);
- BUG_ON(ret);
+#endif
+}
- ret = btrfs_del_root(trans, root->tree_root, &snap_key);
- BUG_ON(ret);
+int dirty_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
+ struct buffer_head *buf)
+{
+ WARN_ON(atomic_read(&buf->b_count) == 0);
+ mark_buffer_dirty(buf);
+ return 0;
+}
- return ret;
+int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
+ struct buffer_head *buf)
+{
+ WARN_ON(atomic_read(&buf->b_count) == 0);
+ clear_buffer_dirty(buf);
+ return 0;
}
-static int __setup_root(struct btrfs_super_block *super,
- struct btrfs_root *root, u64 objectid, int fp)
+static int __setup_root(int blocksize,
+ struct btrfs_root *root,
+ struct btrfs_fs_info *fs_info,
+ u64 objectid)
{
- INIT_LIST_HEAD(&root->trans);
- INIT_LIST_HEAD(&root->cache);
- root->cache_size = 0;
- root->fp = fp;
root->node = NULL;
root->commit_root = NULL;
- root->blocksize = btrfs_super_blocksize(super);
+ root->blocksize = blocksize;
root->ref_cows = 0;
- memset(&root->current_insert, 0, sizeof(root->current_insert));
- memset(&root->last_insert, 0, sizeof(root->last_insert));
+ root->fs_info = fs_info;
memset(&root->root_key, 0, sizeof(root->root_key));
memset(&root->root_item, 0, sizeof(root->root_item));
return 0;
}
-static int find_and_setup_root(struct btrfs_super_block *super,
- struct btrfs_root *tree_root, u64 objectid,
- struct btrfs_root *root, int fp)
+static int find_and_setup_root(int blocksize,
+ struct btrfs_root *tree_root,
+ struct btrfs_fs_info *fs_info,
+ u64 objectid,
+ struct btrfs_root *root)
{
int ret;
- __setup_root(super, root, objectid, fp);
+ __setup_root(blocksize, root, fs_info, objectid);
ret = btrfs_find_last_root(tree_root, objectid,
&root->root_item, &root->root_key);
BUG_ON(ret);
return 0;
}
-struct btrfs_root *open_ctree(char *filename, struct btrfs_super_block *super)
+struct btrfs_root *open_ctree(struct super_block *sb)
{
- struct btrfs_root *root = malloc(sizeof(struct btrfs_root));
- struct btrfs_root *extent_root = malloc(sizeof(struct btrfs_root));
- struct btrfs_root *tree_root = malloc(sizeof(struct btrfs_root));
- int fp;
+ struct btrfs_root *root = kmalloc(sizeof(struct btrfs_root),
+ GFP_NOFS);
+ struct btrfs_root *extent_root = kmalloc(sizeof(struct btrfs_root),
+ GFP_NOFS);
+ struct btrfs_root *tree_root = kmalloc(sizeof(struct btrfs_root),
+ GFP_NOFS);
+ struct btrfs_root *inode_root = kmalloc(sizeof(struct btrfs_root),
+ GFP_NOFS);
+ struct btrfs_fs_info *fs_info = kmalloc(sizeof(*fs_info),
+ GFP_NOFS);
int ret;
-
- root->extent_root = extent_root;
- root->tree_root = tree_root;
-
- extent_root->extent_root = extent_root;
- extent_root->tree_root = tree_root;
-
- tree_root->extent_root = extent_root;
- tree_root->tree_root = tree_root;
-
- fp = open(filename, O_CREAT | O_RDWR, 0600);
- if (fp < 0) {
- free(root);
+ struct btrfs_super_block *disk_super;
+
+ init_bit_radix(&fs_info->pinned_radix);
+ init_bit_radix(&fs_info->pending_del_radix);
+ sb_set_blocksize(sb, 4096);
+ fs_info->running_transaction = NULL;
+ fs_info->fs_root = root;
+ fs_info->tree_root = tree_root;
+ fs_info->extent_root = extent_root;
+ fs_info->inode_root = inode_root;
+ fs_info->last_inode_alloc = 0;
+ fs_info->last_inode_alloc_dirid = 0;
+ fs_info->sb = sb;
+ fs_info->btree_inode = NULL;
+#if 0
+ fs_info->btree_inode = new_inode(sb);
+ fs_info->btree_inode->i_ino = 1;
+ fs_info->btree_inode->i_nlink = 1;
+ fs_info->btree_inode->i_size = sb->s_bdev->bd_inode->i_size;
+ fs_info->btree_inode->i_mapping->a_ops = &btree_aops;
+ insert_inode_hash(fs_info->btree_inode);
+ mapping_set_gfp_mask(fs_info->btree_inode->i_mapping, GFP_NOFS);
+#endif
+ fs_info->hash_tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
+ spin_lock_init(&fs_info->hash_lock);
+ if (!fs_info->hash_tfm || IS_ERR(fs_info->hash_tfm)) {
+ printk("failed to allocate sha256 hash\n");
return NULL;
}
- INIT_RADIX_TREE(&root->cache_radix, GFP_KERNEL);
- INIT_RADIX_TREE(&root->pinned_radix, GFP_KERNEL);
- INIT_RADIX_TREE(&extent_root->pinned_radix, GFP_KERNEL);
- INIT_RADIX_TREE(&extent_root->cache_radix, GFP_KERNEL);
- INIT_RADIX_TREE(&tree_root->pinned_radix, GFP_KERNEL);
- INIT_RADIX_TREE(&tree_root->cache_radix, GFP_KERNEL);
-
- ret = pread(fp, super, sizeof(struct btrfs_super_block),
- BTRFS_SUPER_INFO_OFFSET);
- if (ret == 0 || btrfs_super_root(super) == 0) {
- printf("making new FS!\n");
- ret = mkfs(fp, 0, 1024);
- if (ret)
- return NULL;
- ret = pread(fp, super, sizeof(struct btrfs_super_block),
- BTRFS_SUPER_INFO_OFFSET);
- if (ret != sizeof(struct btrfs_super_block))
- return NULL;
+ mutex_init(&fs_info->trans_mutex);
+ mutex_init(&fs_info->fs_mutex);
+ memset(&fs_info->current_insert, 0, sizeof(fs_info->current_insert));
+ memset(&fs_info->last_insert, 0, sizeof(fs_info->last_insert));
+
+ __setup_root(sb->s_blocksize, tree_root,
+ fs_info, BTRFS_ROOT_TREE_OBJECTID);
+ fs_info->sb_buffer = read_tree_block(tree_root,
+ BTRFS_SUPER_INFO_OFFSET /
+ sb->s_blocksize);
+
+ if (!fs_info->sb_buffer) {
+printk("failed2\n");
+ return NULL;
}
- BUG_ON(ret < 0);
-
- __setup_root(super, tree_root, BTRFS_ROOT_TREE_OBJECTID, fp);
- tree_root->node = read_tree_block(tree_root, btrfs_super_root(super));
+ disk_super = (struct btrfs_super_block *)fs_info->sb_buffer->b_data;
+ if (!btrfs_super_root(disk_super)) {
+ return NULL;
+ }
+ fs_info->disk_super = disk_super;
+ tree_root->node = read_tree_block(tree_root,
+ btrfs_super_root(disk_super));
BUG_ON(!tree_root->node);
- ret = find_and_setup_root(super, tree_root, BTRFS_EXTENT_TREE_OBJECTID,
- extent_root, fp);
+ mutex_lock(&fs_info->fs_mutex);
+ ret = find_and_setup_root(sb->s_blocksize, tree_root, fs_info,
+ BTRFS_EXTENT_TREE_OBJECTID, extent_root);
BUG_ON(ret);
- ret = find_and_setup_root(super, tree_root, BTRFS_FS_TREE_OBJECTID,
- root, fp);
+ ret = find_and_setup_root(sb->s_blocksize, tree_root, fs_info,
+ BTRFS_INODE_MAP_OBJECTID, inode_root);
BUG_ON(ret);
+ ret = find_and_setup_root(sb->s_blocksize, tree_root, fs_info,
+ BTRFS_FS_TREE_OBJECTID, root);
+ mutex_unlock(&fs_info->fs_mutex);
+ BUG_ON(ret);
root->commit_root = root->node;
- root->node->count++;
+ get_bh(root->node);
root->ref_cows = 1;
+ root->fs_info->generation = root->root_key.offset + 1;
return root;
}
int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root
- *root, struct btrfs_super_block *s)
+ *root)
{
- int ret;
- btrfs_set_super_root(s, root->tree_root->node->blocknr);
- ret = pwrite(root->fp, s, sizeof(*s),
- BTRFS_SUPER_INFO_OFFSET);
- if (ret != sizeof(*s)) {
- fprintf(stderr, "failed to write new super block err %d\n", ret);
- return ret;
+ struct buffer_head *bh = root->fs_info->sb_buffer;
+
+ btrfs_set_super_root(root->fs_info->disk_super,
+ root->fs_info->tree_root->node->b_blocknr);
+ lock_buffer(bh);
+ WARN_ON(atomic_read(&bh->b_count) < 1);
+ clear_buffer_dirty(bh);
+ csum_tree_block(root, bh, 0);
+ bh->b_end_io = end_buffer_write_sync;
+ get_bh(bh);
+ submit_bh(WRITE, bh);
+ wait_on_buffer(bh);
+ if (!buffer_uptodate(bh)) {
+ WARN_ON(1);
+ return -EIO;
}
return 0;
}
-static int drop_cache(struct btrfs_root *root)
-{
- while(!list_empty(&root->cache)) {
- struct btrfs_buffer *b = list_entry(root->cache.next,
- struct btrfs_buffer, cache);
- list_del_init(&b->cache);
- btrfs_block_release(root, b);
- }
- return 0;
-}
-int close_ctree(struct btrfs_root *root, struct btrfs_super_block *s)
+int close_ctree(struct btrfs_root *root)
{
int ret;
struct btrfs_trans_handle *trans;
- trans = root->running_transaction;
- btrfs_commit_transaction(trans, root, s);
- ret = commit_extent_and_tree_roots(trans, root->tree_root,
- root->extent_root);
+ mutex_lock(&root->fs_info->fs_mutex);
+ trans = btrfs_start_transaction(root, 1);
+ btrfs_commit_transaction(trans, root);
+ /* run commit again to drop the original snapshot */
+ trans = btrfs_start_transaction(root, 1);
+ btrfs_commit_transaction(trans, root);
+ ret = btrfs_write_and_wait_transaction(NULL, root);
BUG_ON(ret);
- write_ctree_super(trans, root, s);
- drop_cache(root->extent_root);
- drop_cache(root->tree_root);
- drop_cache(root);
- BUG_ON(!list_empty(&root->trans));
- BUG_ON(!list_empty(&root->extent_root->trans));
- BUG_ON(!list_empty(&root->tree_root->trans));
-
- close(root->fp);
+ write_ctree_super(NULL, root);
+ mutex_unlock(&root->fs_info->fs_mutex);
+
if (root->node)
btrfs_block_release(root, root->node);
- if (root->extent_root->node)
- btrfs_block_release(root->extent_root, root->extent_root->node);
- if (root->tree_root->node)
- btrfs_block_release(root->tree_root, root->tree_root->node);
+ if (root->fs_info->extent_root->node)
+ btrfs_block_release(root->fs_info->extent_root,
+ root->fs_info->extent_root->node);
+ if (root->fs_info->inode_root->node)
+ btrfs_block_release(root->fs_info->inode_root,
+ root->fs_info->inode_root->node);
+ if (root->fs_info->tree_root->node)
+ btrfs_block_release(root->fs_info->tree_root,
+ root->fs_info->tree_root->node);
btrfs_block_release(root, root->commit_root);
- free(root);
- printf("on close %d blocks are allocated\n", allocated_blocks);
+ btrfs_block_release(root, root->fs_info->sb_buffer);
+ crypto_free_hash(root->fs_info->hash_tfm);
+ // truncate_inode_pages(root->fs_info->btree_inode->i_mapping, 0);
+ // iput(root->fs_info->btree_inode);
+ kfree(root->fs_info->extent_root);
+ kfree(root->fs_info->inode_root);
+ kfree(root->fs_info->tree_root);
+ kfree(root->fs_info);
+ kfree(root);
return 0;
}
-void btrfs_block_release(struct btrfs_root *root, struct btrfs_buffer *buf)
+void btrfs_block_release(struct btrfs_root *root, struct buffer_head *buf)
{
- buf->count--;
- if (buf->count < 0)
- BUG();
- if (buf->count == 0) {
- BUG_ON(!list_empty(&buf->cache));
- BUG_ON(!list_empty(&buf->dirty));
- if (!radix_tree_lookup(&root->cache_radix, buf->blocknr))
- BUG();
- radix_tree_delete(&root->cache_radix, buf->blocknr);
- memset(buf, 0, sizeof(*buf));
- free(buf);
- BUG_ON(allocated_blocks == 0);
- allocated_blocks--;
- BUG_ON(root->cache_size == 0);
- root->cache_size--;
- }
+ // brelse(buf);
}
git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff