Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 128337
b: refs/heads/master
c: 0f7d52f
h: refs/heads/master
i:
  128335: 05ae330
v: v3
  • Loading branch information
Chris Mason authored and David Woodhouse committed Apr 9, 2007
1 parent b37f642 commit 3112a7f
Show file tree
Hide file tree
Showing 7 changed files with 283 additions and 100 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d6e4a428eb8f92bbb3537ccabadfb1195efb432b
refs/heads/master: 0f7d52f4431c530b4f39c524448c688bb7754de5
2 changes: 1 addition & 1 deletion trunk/fs/btrfs/bit-radix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int find_first_radix_bit(struct radix_tree_root *radix, unsigned long *retbits,
int i;
int total_found = 0;

ret = radix_tree_gang_lookup(radix, (void *)&gang, 0, ARRAY_SIZE(gang));
ret = radix_tree_gang_lookup(radix, (void **)gang, 0, ARRAY_SIZE(gang));
for (i = 0; i < ret && nr > 0; i++) {
found = 0;
bits = gang[i];
Expand Down
20 changes: 17 additions & 3 deletions trunk/fs/btrfs/ctree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,12 @@ struct btrfs_inode_map_item {

struct crypto_hash;
struct btrfs_fs_info {
struct btrfs_root *fs_root;
struct btrfs_root *extent_root;
struct btrfs_root *tree_root;
struct btrfs_root *inode_root;
struct btrfs_key current_insert;
struct btrfs_key last_insert;
struct radix_tree_root fs_roots_radix;
struct radix_tree_root pending_del_radix;
struct radix_tree_root pinned_radix;
u64 last_inode_alloc;
Expand Down Expand Up @@ -266,6 +266,9 @@ struct btrfs_root {
struct btrfs_root_item root_item;
struct btrfs_key root_key;
struct btrfs_fs_info *fs_info;
struct inode *inode;
u64 objectid;
u64 last_trans;
u32 blocksize;
int ref_cows;
u32 type;
Expand Down Expand Up @@ -595,7 +598,7 @@ static inline u32 btrfs_key_overflow(struct btrfs_key *key)

static inline void btrfs_set_key_overflow(struct btrfs_key *key, u32 over)
{
BUG_ON(over > BTRFS_KEY_OVERFLOW_MAX);
BUG_ON(over >= BTRFS_KEY_OVERFLOW_MAX);
over = over << BTRFS_KEY_OVERFLOW_SHIFT;
key->flags = (key->flags & ~((u64)BTRFS_KEY_OVERFLOW_MASK)) | over;
}
Expand Down Expand Up @@ -634,7 +637,7 @@ static inline void btrfs_set_disK_key_overflow(struct btrfs_disk_key *key,
u32 over)
{
u32 flags = btrfs_disk_key_flags(key);
BUG_ON(over > BTRFS_KEY_OVERFLOW_MAX);
BUG_ON(over >= BTRFS_KEY_OVERFLOW_MAX);
over = over << BTRFS_KEY_OVERFLOW_SHIFT;
flags = (flags & ~((u64)BTRFS_KEY_OVERFLOW_MASK)) | over;
btrfs_set_disk_key_flags(key, flags);
Expand Down Expand Up @@ -748,6 +751,17 @@ static inline void btrfs_set_super_blocknr(struct btrfs_super_block *s, u64 val)
s->blocknr = cpu_to_le64(val);
}

static inline u64 btrfs_super_generation(struct btrfs_super_block *s)
{
return le64_to_cpu(s->generation);
}

static inline void btrfs_set_super_generation(struct btrfs_super_block *s,
u64 val)
{
s->generation = cpu_to_le64(val);
}

static inline u64 btrfs_super_root(struct btrfs_super_block *s)
{
return le64_to_cpu(s->root);
Expand Down
178 changes: 137 additions & 41 deletions trunk/fs/btrfs/disk-io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
#include <linux/crypto.h>
#include <linux/scatterlist.h>
#include <linux/swap.h>
#include <linux/radix-tree.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
#include "btrfs_inode.h"

static int check_tree_block(struct btrfs_root *root, struct buffer_head *buf)
{
Expand Down Expand Up @@ -180,7 +182,7 @@ static int csum_tree_block(struct btrfs_root *root, struct buffer_head *bh,
static int btree_writepage(struct page *page, struct writeback_control *wbc)
{
struct buffer_head *bh;
struct btrfs_root *root = btrfs_sb(page->mapping->host->i_sb);
struct btrfs_root *root = BTRFS_I(page->mapping->host)->root;
struct buffer_head *head;
if (!page_has_buffers(page)) {
create_empty_buffers(page, root->fs_info->sb->s_blocksize,
Expand Down Expand Up @@ -259,10 +261,13 @@ static int __setup_root(int blocksize,
u64 objectid)
{
root->node = NULL;
root->inode = NULL;
root->commit_root = NULL;
root->blocksize = blocksize;
root->ref_cows = 0;
root->fs_info = fs_info;
root->objectid = objectid;
root->last_trans = 0;
memset(&root->root_key, 0, sizeof(root->root_key));
memset(&root->root_item, 0, sizeof(root->root_item));
return 0;
Expand All @@ -287,10 +292,78 @@ static int find_and_setup_root(int blocksize,
return 0;
}

struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
struct btrfs_key *location)
{
struct btrfs_root *root;
struct btrfs_root *tree_root = fs_info->tree_root;
struct btrfs_path *path;
struct btrfs_leaf *l;
int ret = 0;

printk("read_fs_root looking for %Lu %Lu %u\n", location->objectid, location->offset, location->flags);
root = kmalloc(sizeof(*root), GFP_NOFS);
if (!root) {
printk("failed1\n");
return ERR_PTR(-ENOMEM);
}
if (location->offset == (u64)-1) {
ret = find_and_setup_root(fs_info->sb->s_blocksize,
fs_info->tree_root, fs_info,
location->objectid, root);
if (ret) {
printk("failed2\n");
kfree(root);
return ERR_PTR(ret);
}
goto insert;
}

__setup_root(fs_info->sb->s_blocksize, root, fs_info,
location->objectid);

path = btrfs_alloc_path();
BUG_ON(!path);
ret = btrfs_search_slot(NULL, tree_root, location, path, 0, 0);
if (ret != 0) {
printk("internal search_slot gives us %d\n", ret);
if (ret > 0)
ret = -ENOENT;
goto out;
}
l = btrfs_buffer_leaf(path->nodes[0]);
memcpy(&root->root_item,
btrfs_item_ptr(l, path->slots[0], struct btrfs_root_item),
sizeof(root->root_item));
memcpy(&root->root_key, location, sizeof(*location));
ret = 0;
out:
btrfs_release_path(root, path);
btrfs_free_path(path);
if (ret) {
kfree(root);
return ERR_PTR(ret);
}
root->node = read_tree_block(root,
btrfs_root_blocknr(&root->root_item));
BUG_ON(!root->node);
insert:
printk("inserting %p\n", root);
root->ref_cows = 1;
ret = radix_tree_insert(&fs_info->fs_roots_radix, (unsigned long)root,
root);
if (ret) {
printk("radix_tree_insert gives us %d\n", ret);
brelse(root->node);
kfree(root);
return ERR_PTR(ret);
}
printk("all worked\n");
return root;
}

struct btrfs_root *open_ctree(struct super_block *sb)
{
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),
Expand All @@ -304,9 +377,9 @@ struct btrfs_root *open_ctree(struct super_block *sb)

init_bit_radix(&fs_info->pinned_radix);
init_bit_radix(&fs_info->pending_del_radix);
INIT_RADIX_TREE(&fs_info->fs_roots_radix, GFP_NOFS);
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;
Expand All @@ -318,6 +391,9 @@ struct btrfs_root *open_ctree(struct super_block *sb)
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;
BTRFS_I(fs_info->btree_inode)->root = tree_root;
memset(&BTRFS_I(fs_info->btree_inode)->location, 0,
sizeof(struct btrfs_key));
insert_inode_hash(fs_info->btree_inode);
mapping_set_gfp_mask(fs_info->btree_inode->i_mapping, GFP_NOFS);
fs_info->hash_tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
Expand All @@ -337,13 +413,12 @@ struct btrfs_root *open_ctree(struct super_block *sb)
BTRFS_SUPER_INFO_OFFSET /
sb->s_blocksize);

if (!fs_info->sb_buffer) {
if (!fs_info->sb_buffer)
return NULL;
}
disk_super = (struct btrfs_super_block *)fs_info->sb_buffer->b_data;
if (!btrfs_super_root(disk_super)) {
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));
Expand All @@ -358,22 +433,16 @@ struct btrfs_root *open_ctree(struct super_block *sb)
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);
BUG_ON(ret);
root->commit_root = root->node;
get_bh(root->node);
root->ref_cows = 1;
root->fs_info->generation = root->root_key.offset + 1;
ret = btrfs_find_highest_inode(root, &root->fs_info->last_inode_alloc);
fs_info->generation = btrfs_super_generation(disk_super) + 1;
ret = btrfs_find_highest_inode(tree_root, &fs_info->last_inode_alloc);
if (ret == 0)
fs_info->highest_inode = fs_info->last_inode_alloc;
memset(&fs_info->kobj, 0, sizeof(fs_info->kobj));
kobj_set_kset_s(fs_info, btrfs_subsys);
kobject_set_name(&fs_info->kobj, "%s", sb->s_id);
kobject_register(&fs_info->kobj);
mutex_unlock(&fs_info->fs_mutex);
return root;
return tree_root;
}

int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root
Expand All @@ -398,12 +467,42 @@ int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root
return 0;
}

int del_fs_roots(struct btrfs_fs_info *fs_info)
{
int ret;
struct btrfs_root *gang[8];
int i;

while(1) {
ret = radix_tree_gang_lookup(&fs_info->fs_roots_radix,
(void **)gang, 0,
ARRAY_SIZE(gang));
if (!ret)
break;
for (i = 0; i < ret; i++) {
radix_tree_delete(&fs_info->fs_roots_radix,
(unsigned long)gang[i]);
if (gang[i]->inode)
iput(gang[i]->inode);
else
printk("no inode for root %p\n", gang[i]);
if (gang[i]->node)
brelse(gang[i]->node);
if (gang[i]->commit_root)
brelse(gang[i]->commit_root);
kfree(gang[i]);
}
}
return 0;
}

int close_ctree(struct btrfs_root *root)
{
int ret;
struct btrfs_trans_handle *trans;
struct btrfs_fs_info *fs_info = root->fs_info;

mutex_lock(&root->fs_info->fs_mutex);
mutex_lock(&fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
btrfs_commit_transaction(trans, root);
/* run commit again to drop the original snapshot */
Expand All @@ -412,29 +511,26 @@ int close_ctree(struct btrfs_root *root)
ret = btrfs_write_and_wait_transaction(NULL, root);
BUG_ON(ret);
write_ctree_super(NULL, root);
mutex_unlock(&root->fs_info->fs_mutex);

if (root->node)
btrfs_block_release(root, 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);
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);
kobject_unregister(&root->fs_info->kobj);
kfree(root);
mutex_unlock(&fs_info->fs_mutex);

if (fs_info->extent_root->node)
btrfs_block_release(fs_info->extent_root,
fs_info->extent_root->node);
if (fs_info->inode_root->node)
btrfs_block_release(fs_info->inode_root,
fs_info->inode_root->node);
if (fs_info->tree_root->node)
btrfs_block_release(fs_info->tree_root,
fs_info->tree_root->node);
btrfs_block_release(root, fs_info->sb_buffer);
crypto_free_hash(fs_info->hash_tfm);
truncate_inode_pages(fs_info->btree_inode->i_mapping, 0);
iput(fs_info->btree_inode);
del_fs_roots(fs_info);
kfree(fs_info->extent_root);
kfree(fs_info->inode_root);
kfree(fs_info->tree_root);
kobject_unregister(&fs_info->kobj);
return 0;
}

Expand Down
2 changes: 2 additions & 0 deletions trunk/fs/btrfs/disk-io.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
struct buffer_head *btrfs_find_tree_block(struct btrfs_root *root, u64 blocknr);
int btrfs_csum_data(struct btrfs_root * root, char *data, size_t len,
char *result);
struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
struct btrfs_key *location);
#endif
Loading

0 comments on commit 3112a7f

Please sign in to comment.