#include "btrfs_inode.h"
#include "ioctl.h"
-void btrfs_fsinfo_release(struct kobject *obj)
-{
- struct btrfs_fs_info *fsinfo = container_of(obj,
- struct btrfs_fs_info, kobj);
- kfree(fsinfo);
-}
-
-struct kobj_type btrfs_fsinfo_ktype = {
- .release = btrfs_fsinfo_release,
-};
-
struct btrfs_iget_args {
u64 ino;
struct btrfs_root *root;
};
-decl_subsys(btrfs, &btrfs_fsinfo_ktype, NULL);
-
#define BTRFS_SUPER_MAGIC 0x9123682E
static struct inode_operations btrfs_dir_inode_operations;
struct btrfs_inode_item *inode_item;
struct btrfs_root *root = BTRFS_I(inode)->root;
struct btrfs_key location;
+ struct btrfs_block_group_cache *alloc_group;
+ u64 alloc_group_block;
int ret;
path = btrfs_alloc_path();
inode->i_ctime.tv_nsec = btrfs_timespec_nsec(&inode_item->ctime);
inode->i_blocks = btrfs_inode_nblocks(inode_item);
inode->i_generation = btrfs_inode_generation(inode_item);
+ alloc_group_block = btrfs_inode_block_group(inode_item);
+ ret = radix_tree_gang_lookup(&root->fs_info->block_group_radix,
+ (void **)&alloc_group,
+ alloc_group_block, 1);
+ BUG_ON(!ret);
+ BTRFS_I(inode)->block_group = alloc_group;
btrfs_free_path(path);
inode_item = NULL;
make_bad_inode(inode);
}
+static void fill_inode_item(struct btrfs_inode_item *item,
+ struct inode *inode)
+{
+ btrfs_set_inode_uid(item, inode->i_uid);
+ btrfs_set_inode_gid(item, inode->i_gid);
+ btrfs_set_inode_size(item, inode->i_size);
+ btrfs_set_inode_mode(item, inode->i_mode);
+ btrfs_set_inode_nlink(item, inode->i_nlink);
+ btrfs_set_timespec_sec(&item->atime, inode->i_atime.tv_sec);
+ btrfs_set_timespec_nsec(&item->atime, inode->i_atime.tv_nsec);
+ btrfs_set_timespec_sec(&item->mtime, inode->i_mtime.tv_sec);
+ btrfs_set_timespec_nsec(&item->mtime, inode->i_mtime.tv_nsec);
+ btrfs_set_timespec_sec(&item->ctime, inode->i_ctime.tv_sec);
+ btrfs_set_timespec_nsec(&item->ctime, inode->i_ctime.tv_nsec);
+ btrfs_set_inode_nblocks(item, inode->i_blocks);
+ btrfs_set_inode_generation(item, inode->i_generation);
+ btrfs_set_inode_block_group(item,
+ BTRFS_I(inode)->block_group->key.objectid);
+}
+
+static int btrfs_update_inode(struct btrfs_trans_handle *trans,
+ struct btrfs_root *root,
+ struct inode *inode)
+{
+ struct btrfs_inode_item *inode_item;
+ struct btrfs_path *path;
+ int ret;
+
+ path = btrfs_alloc_path();
+ BUG_ON(!path);
+ btrfs_init_path(path);
+ ret = btrfs_lookup_inode(trans, root, path,
+ &BTRFS_I(inode)->location, 1);
+ if (ret) {
+ if (ret > 0)
+ ret = -ENOENT;
+ goto failed;
+ }
+
+ inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
+ path->slots[0],
+ struct btrfs_inode_item);
+
+ fill_inode_item(inode_item, inode);
+ btrfs_mark_buffer_dirty(path->nodes[0]);
+ ret = 0;
+failed:
+ btrfs_release_path(root, path);
+ btrfs_free_path(path);
+ return ret;
+}
+
+
static int btrfs_unlink_trans(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct inode *dir,
dentry->d_inode->i_ctime = dir->i_ctime;
err:
btrfs_free_path(path);
- if (ret == 0) {
- inode_dec_link_count(dentry->d_inode);
+ if (!ret) {
dir->i_size -= name_len * 2;
- mark_inode_dirty(dir);
+ btrfs_update_inode(trans, root, dir);
+ drop_nlink(dentry->d_inode);
+ btrfs_update_inode(trans, root, dentry->d_inode);
+ dir->i_sb->s_dirt = 1;
}
return ret;
}
root = BTRFS_I(dir)->root;
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, dir);
ret = btrfs_unlink_trans(trans, root, dir, dentry);
btrfs_end_transaction(trans, root);
mutex_unlock(&root->fs_info->fs_mutex);
+ btrfs_btree_balance_dirty(root);
return ret;
}
btrfs_init_path(path);
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, dir);
key.objectid = inode->i_ino;
key.offset = (u64)-1;
key.flags = (u32)-1;
btrfs_free_path(path);
mutex_unlock(&root->fs_info->fs_mutex);
ret = btrfs_end_transaction(trans, root);
+ btrfs_btree_balance_dirty(root);
if (ret && !err)
err = ret;
return err;
return ret;
}
+static void reada_truncate(struct btrfs_root *root, struct btrfs_path *path,
+ u64 objectid)
+{
+ struct btrfs_node *node;
+ int i;
+ int nritems;
+ u64 item_objectid;
+ u64 blocknr;
+ int slot;
+ int ret;
+
+ if (!path->nodes[1])
+ return;
+ node = btrfs_buffer_node(path->nodes[1]);
+ slot = path->slots[1];
+ if (slot == 0)
+ return;
+ nritems = btrfs_header_nritems(&node->header);
+ for (i = slot - 1; i >= 0; i--) {
+ item_objectid = btrfs_disk_key_objectid(&node->ptrs[i].key);
+ if (item_objectid != objectid)
+ break;
+ blocknr = btrfs_node_blockptr(node, i);
+ ret = readahead_tree_block(root, blocknr);
+ if (ret)
+ break;
+ }
+}
+
static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct inode *inode)
struct btrfs_path *path;
struct btrfs_key key;
struct btrfs_disk_key *found_key;
+ u32 found_type;
struct btrfs_leaf *leaf;
struct btrfs_file_extent_item *fi = NULL;
u64 extent_start = 0;
/* FIXME, add redo link to tree so we don't leak on crash */
key.objectid = inode->i_ino;
key.offset = (u64)-1;
- key.flags = 0;
- /*
- * use BTRFS_CSUM_ITEM_KEY because it is larger than inline keys
- * or extent data
- */
- btrfs_set_key_type(&key, BTRFS_CSUM_ITEM_KEY);
+ key.flags = (u32)-1;
while(1) {
btrfs_init_path(path);
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
BUG_ON(path->slots[0] == 0);
path->slots[0]--;
}
+ reada_truncate(root, path, inode->i_ino);
leaf = btrfs_buffer_leaf(path->nodes[0]);
found_key = &leaf->items[path->slots[0]].key;
+ found_type = btrfs_disk_key_type(found_key);
if (btrfs_disk_key_objectid(found_key) != inode->i_ino)
break;
- if (btrfs_disk_key_type(found_key) != BTRFS_CSUM_ITEM_KEY &&
- btrfs_disk_key_type(found_key) != BTRFS_INLINE_DATA_KEY &&
- btrfs_disk_key_type(found_key) != BTRFS_EXTENT_DATA_KEY)
+ if (found_type != BTRFS_CSUM_ITEM_KEY &&
+ found_type != BTRFS_DIR_ITEM_KEY &&
+ found_type != BTRFS_DIR_INDEX_KEY &&
+ found_type != BTRFS_EXTENT_DATA_KEY)
break;
if (btrfs_disk_key_offset(found_key) < inode->i_size)
break;
error:
btrfs_release_path(root, path);
btrfs_free_path(path);
+ inode->i_sb->s_dirt = 1;
return ret;
}
inode->i_size = 0;
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
- if (S_ISREG(inode->i_mode)) {
- ret = btrfs_truncate_in_trans(trans, root, inode);
- BUG_ON(ret);
- }
+ btrfs_set_trans_block_group(trans, inode);
+ ret = btrfs_truncate_in_trans(trans, root, inode);
+ BUG_ON(ret);
btrfs_free_inode(trans, root, inode);
btrfs_end_transaction(trans, root);
mutex_unlock(&root->fs_info->fs_mutex);
+ btrfs_btree_balance_dirty(root);
return;
no_delete:
clear_inode(inode);
return ret;
}
-int fixup_tree_root_location(struct btrfs_root *root,
+static int fixup_tree_root_location(struct btrfs_root *root,
struct btrfs_key *location,
struct btrfs_root **sub_root)
{
return 0;
}
-int btrfs_init_locked_inode(struct inode *inode, void *p)
+static int btrfs_init_locked_inode(struct inode *inode, void *p)
{
struct btrfs_iget_args *args = p;
inode->i_ino = args->ino;
return 0;
}
-int btrfs_find_actor(struct inode *inode, void *opaque)
+static int btrfs_find_actor(struct inode *inode, void *opaque)
{
struct btrfs_iget_args *args = opaque;
return (args->ino == inode->i_ino &&
args->root == BTRFS_I(inode)->root);
}
-struct inode *btrfs_iget_locked(struct super_block *s, u64 objectid,
- struct btrfs_root *root)
+static struct inode *btrfs_iget_locked(struct super_block *s, u64 objectid,
+ struct btrfs_root *root)
{
struct inode *inode;
struct btrfs_iget_args args;
return d_splice_alias(inode, dentry);
}
+static void reada_leaves(struct btrfs_root *root, struct btrfs_path *path,
+ u64 objectid)
+{
+ struct btrfs_node *node;
+ int i;
+ u32 nritems;
+ u64 item_objectid;
+ u64 blocknr;
+ int slot;
+ int ret;
+
+ if (!path->nodes[1])
+ return;
+ node = btrfs_buffer_node(path->nodes[1]);
+ slot = path->slots[1];
+ nritems = btrfs_header_nritems(&node->header);
+ for (i = slot + 1; i < nritems; i++) {
+ item_objectid = btrfs_disk_key_objectid(&node->ptrs[i].key);
+ if (item_objectid != objectid)
+ break;
+ blocknr = btrfs_node_blockptr(node, i);
+ ret = readahead_tree_block(root, blocknr);
+ if (ret)
+ break;
+ }
+}
+
static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
{
struct inode *inode = filp->f_path.dentry->d_inode;
if (ret < 0)
goto err;
advance = 0;
+ reada_leaves(root, path, inode->i_ino);
while(1) {
leaf = btrfs_buffer_leaf(path->nodes[0]);
nritems = btrfs_header_nritems(&leaf->header);
slot = path->slots[0];
if (advance || slot >= nritems) {
if (slot >= nritems -1) {
+ reada_leaves(root, path, inode->i_ino);
ret = btrfs_next_leaf(root, path);
if (ret)
break;
return 0;
}
-static void fill_inode_item(struct btrfs_inode_item *item,
- struct inode *inode)
-{
- btrfs_set_inode_uid(item, inode->i_uid);
- btrfs_set_inode_gid(item, inode->i_gid);
- btrfs_set_inode_size(item, inode->i_size);
- btrfs_set_inode_mode(item, inode->i_mode);
- btrfs_set_inode_nlink(item, inode->i_nlink);
- btrfs_set_timespec_sec(&item->atime, inode->i_atime.tv_sec);
- btrfs_set_timespec_nsec(&item->atime, inode->i_atime.tv_nsec);
- btrfs_set_timespec_sec(&item->mtime, inode->i_mtime.tv_sec);
- btrfs_set_timespec_nsec(&item->mtime, inode->i_mtime.tv_nsec);
- btrfs_set_timespec_sec(&item->ctime, inode->i_ctime.tv_sec);
- btrfs_set_timespec_nsec(&item->ctime, inode->i_ctime.tv_nsec);
- btrfs_set_inode_nblocks(item, inode->i_blocks);
- btrfs_set_inode_generation(item, inode->i_generation);
-}
-
-static int btrfs_update_inode(struct btrfs_trans_handle *trans,
- struct btrfs_root *root,
- struct inode *inode)
-{
- struct btrfs_inode_item *inode_item;
- struct btrfs_path *path;
- int ret;
-
- path = btrfs_alloc_path();
- BUG_ON(!path);
- btrfs_init_path(path);
- ret = btrfs_lookup_inode(trans, root, path,
- &BTRFS_I(inode)->location, 1);
- if (ret) {
- if (ret > 0)
- ret = -ENOENT;
- goto failed;
- }
-
- inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
- path->slots[0],
- struct btrfs_inode_item);
-
- fill_inode_item(inode_item, inode);
- btrfs_mark_buffer_dirty(path->nodes[0]);
- ret = 0;
-failed:
- btrfs_release_path(root, path);
- btrfs_free_path(path);
- return ret;
-}
-
static int btrfs_write_inode(struct inode *inode, int wait)
{
struct btrfs_root *root = BTRFS_I(inode)->root;
if (wait) {
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, inode);
ret = btrfs_commit_transaction(trans, root);
mutex_unlock(&root->fs_info->fs_mutex);
}
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, inode);
btrfs_update_inode(trans, root, inode);
btrfs_end_transaction(trans, root);
mutex_unlock(&root->fs_info->fs_mutex);
+ btrfs_btree_balance_dirty(root);
}
static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
- u64 objectid, int mode)
+ u64 objectid,
+ struct btrfs_block_group_cache *group,
+ int mode)
{
struct inode *inode;
struct btrfs_inode_item inode_item;
struct btrfs_key *location;
int ret;
+ int owner;
inode = new_inode(root->fs_info->sb);
if (!inode)
return ERR_PTR(-ENOMEM);
BTRFS_I(inode)->root = root;
+ if (mode & S_IFDIR)
+ owner = 0;
+ else
+ owner = 1;
+ group = btrfs_find_block_group(root, group, 0, 0, owner);
+ BTRFS_I(inode)->block_group = group;
inode->i_uid = current->fsuid;
inode->i_gid = current->fsgid;
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, dir);
err = btrfs_find_free_objectid(trans, root, dir->i_ino, &objectid);
if (err) {
goto out_unlock;
}
- inode = btrfs_new_inode(trans, root, objectid, mode);
+ inode = btrfs_new_inode(trans, root, objectid,
+ BTRFS_I(dir)->block_group, mode);
err = PTR_ERR(inode);
if (IS_ERR(inode))
goto out_unlock;
- // FIXME mark the inode dirty
+
+ btrfs_set_trans_block_group(trans, inode);
err = btrfs_add_nondir(trans, dentry, inode);
if (err)
drop_inode = 1;
inode->i_op = &btrfs_file_inode_operations;
}
dir->i_sb->s_dirt = 1;
+ btrfs_update_inode_block_group(trans, inode);
+ btrfs_update_inode_block_group(trans, dir);
out_unlock:
btrfs_end_transaction(trans, root);
mutex_unlock(&root->fs_info->fs_mutex);
inode_dec_link_count(inode);
iput(inode);
}
+ btrfs_btree_balance_dirty(root);
return err;
}
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, dir);
if (IS_ERR(trans)) {
err = PTR_ERR(trans);
goto out_unlock;
goto out_unlock;
}
- inode = btrfs_new_inode(trans, root, objectid, S_IFDIR | mode);
+ inode = btrfs_new_inode(trans, root, objectid,
+ BTRFS_I(dir)->block_group, S_IFDIR | mode);
if (IS_ERR(inode)) {
err = PTR_ERR(inode);
goto out_fail;
drop_on_err = 1;
inode->i_op = &btrfs_dir_inode_operations;
inode->i_fop = &btrfs_dir_file_operations;
+ btrfs_set_trans_block_group(trans, inode);
err = btrfs_make_empty_dir(trans, root, inode->i_ino, dir->i_ino);
if (err)
goto out_fail;
d_instantiate(dentry, inode);
drop_on_err = 0;
+ dir->i_sb->s_dirt = 1;
+ btrfs_update_inode_block_group(trans, inode);
+ btrfs_update_inode_block_group(trans, dir);
out_fail:
btrfs_end_transaction(trans, root);
mutex_unlock(&root->fs_info->fs_mutex);
if (drop_on_err)
iput(inode);
+ btrfs_btree_balance_dirty(root);
return err;
}
filemap_flush(root->fs_info->btree_inode->i_mapping);
return 0;
}
- filemap_write_and_wait(root->fs_info->btree_inode->i_mapping);
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
ret = btrfs_commit_transaction(trans, root);
found_type != BTRFS_EXTENT_DATA_KEY) {
extent_end = 0;
extent_start = 0;
- btrfs_release_path(root, path);
goto out;
}
found_type = btrfs_file_extent_type(item);
btrfs_map_bh_to_logical(root, result, 0);
}
out:
- btrfs_release_path(root, path);
btrfs_free_path(path);
return err;
}
} else if (!buffer_mapped(bh) && buffer_dirty(bh)) {
WARN_ON(bh->b_size != blocksize);
err = btrfs_get_block(inode, block, bh, 0);
- if (err)
+ if (err) {
+printk("writepage going to recovery err %d\n", err);
goto recover;
+ }
if (buffer_new(bh)) {
/* blockdev mappings never come here */
clear_buffer_new(bh);
- unmap_underlying_metadata(bh->b_bdev,
- bh->b_blocknr);
}
}
bh = bh->b_this_page;
if (uptodate)
SetPageUptodate(page);
end_page_writeback(page);
- /*
- * The page and buffer_heads can be released at any time from
- * here on.
- */
- wbc->pages_skipped++; /* We didn't write this page */
}
return err;
/* FIXME, add redo link to tree so we don't leak on crash */
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, inode);
ret = btrfs_truncate_in_trans(trans, root, inode);
BUG_ON(ret);
+ btrfs_update_inode(trans, root, inode);
ret = btrfs_end_transaction(trans, root);
BUG_ON(ret);
mutex_unlock(&root->fs_info->fs_mutex);
- mark_inode_dirty(inode);
+ btrfs_btree_balance_dirty(root);
}
/*
mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, inode);
bh = page_buffers(pages[i]);
if (buffer_mapped(bh) && bh->b_blocknr == 0) {
btrfs_set_file_extent_type(ei,
BTRFS_FILE_EXTENT_INLINE);
ptr = btrfs_file_extent_inline_start(ei);
- memcpy(ptr, bh->b_data, offset + write_bytes);
+ btrfs_memcpy(root, path->nodes[0]->b_data,
+ ptr, bh->b_data, offset + write_bytes);
mark_buffer_dirty(path->nodes[0]);
btrfs_free_path(path);
} else {
kunmap(pages[i]);
}
SetPageChecked(pages[i]);
+ // btrfs_update_inode_block_group(trans, inode);
ret = btrfs_end_transaction(trans, root);
BUG_ON(ret);
mutex_unlock(&root->fs_info->fs_mutex);
static int drop_extents(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct inode *inode,
- u64 start, u64 end)
+ u64 start, u64 end, u64 *hint_block)
{
int ret;
struct btrfs_key key;
new_num = (start - key.offset) >>
inode->i_blkbits;
old_num = btrfs_file_extent_num_blocks(extent);
+ *hint_block =
+ btrfs_file_extent_disk_blocknr(extent);
inode->i_blocks -= (old_num - new_num) << 3;
btrfs_set_file_extent_num_blocks(extent,
new_num);
mark_buffer_dirty(path->nodes[0]);
} else {
WARN_ON(1);
- /*
- ret = btrfs_truncate_item(trans, root, path,
- start - key.offset);
- BUG_ON(ret);
- */
}
}
if (!keep) {
btrfs_file_extent_disk_num_blocks(extent);
extent_num_blocks =
btrfs_file_extent_num_blocks(extent);
+ *hint_block =
+ btrfs_file_extent_disk_blocknr(extent);
}
ret = btrfs_del_item(trans, root, path);
BUG_ON(ret);
btrfs_release_path(root, path);
+ extent = NULL;
if (found_extent) {
- inode->i_blocks -=
- btrfs_file_extent_num_blocks(extent) << 3;
+ inode->i_blocks -= extent_num_blocks << 3;
ret = btrfs_free_extent(trans, root,
disk_blocknr,
disk_num_blocks, 0);
err = -ENOMEM;
goto failed_release;
}
+ cancel_dirty_page(pages[i], PAGE_CACHE_SIZE);
+ wait_on_page_writeback(pages[i]);
offset = pos & (PAGE_CACHE_SIZE -1);
this_write = min(PAGE_CACHE_SIZE - offset, write_bytes);
- create_empty_buffers(pages[i], root->fs_info->sb->s_blocksize,
- (1 << BH_Uptodate));
+ if (!page_has_buffers(pages[i])) {
+ create_empty_buffers(pages[i],
+ root->fs_info->sb->s_blocksize,
+ (1 << BH_Uptodate));
+ }
head = page_buffers(pages[i]);
bh = head;
do {
struct inode *inode = file->f_path.dentry->d_inode;
struct btrfs_root *root = BTRFS_I(inode)->root;
struct page *pages[8];
- struct page *pinned[2] = { NULL, NULL };
+ struct page *pinned[2];
unsigned long first_index;
unsigned long last_index;
u64 start_pos;
u64 num_blocks;
u64 alloc_extent_start;
+ u64 hint_block;
struct btrfs_trans_handle *trans;
struct btrfs_key ins;
-
+ pinned[0] = NULL;
+ pinned[1] = NULL;
if (file->f_flags & O_DIRECT)
return -EINVAL;
pos = *ppos;
if (!PageUptodate(pinned[0])) {
ret = mpage_readpage(pinned[0], btrfs_get_block);
BUG_ON(ret);
+ wait_on_page_locked(pinned[0]);
} else {
unlock_page(pinned[0]);
}
}
if (first_index != last_index &&
(last_index << PAGE_CACHE_SHIFT) < inode->i_size &&
+ pos + count < inode->i_size &&
(count & (PAGE_CACHE_SIZE - 1))) {
pinned[1] = grab_cache_page(inode->i_mapping, last_index);
if (!PageUptodate(pinned[1])) {
ret = mpage_readpage(pinned[1], btrfs_get_block);
BUG_ON(ret);
+ wait_on_page_locked(pinned[1]);
} else {
unlock_page(pinned[1]);
}
mutex_unlock(&root->fs_info->fs_mutex);
goto out_unlock;
}
+ btrfs_set_trans_block_group(trans, inode);
/* FIXME blocksize != 4096 */
inode->i_blocks += num_blocks << 3;
+ hint_block = 0;
if (start_pos < inode->i_size) {
/* FIXME blocksize != pagesize */
ret = drop_extents(trans, root, inode,
start_pos,
(pos + count + root->blocksize -1) &
- ~((u64)root->blocksize - 1));
+ ~((u64)root->blocksize - 1), &hint_block);
BUG_ON(ret);
}
if (inode->i_size >= PAGE_CACHE_SIZE || pos + count < inode->i_size ||
pos + count - start_pos > BTRFS_MAX_INLINE_DATA_SIZE(root)) {
ret = btrfs_alloc_extent(trans, root, inode->i_ino,
- num_blocks, 1, (u64)-1, &ins);
+ num_blocks, hint_block, (u64)-1,
+ &ins, 1);
BUG_ON(ret);
ret = btrfs_insert_file_extent(trans, root, inode->i_ino,
start_pos, ins.objectid, ins.offset);
}
BUG_ON(ret);
alloc_extent_start = ins.objectid;
+ // btrfs_update_inode_block_group(trans, inode);
ret = btrfs_end_transaction(trans, root);
mutex_unlock(&root->fs_info->fs_mutex);
num_written += write_bytes;
balance_dirty_pages_ratelimited(inode->i_mapping);
+ btrfs_btree_balance_dirty(root);
cond_resched();
}
out_unlock:
struct btrfs_leaf *leaf;
struct btrfs_root *new_root;
struct inode *inode;
+ struct inode *dir;
int ret;
u64 objectid;
u64 new_dirid = BTRFS_FIRST_FREE_OBJECTID;
trans = btrfs_start_transaction(root, 1);
BUG_ON(!trans);
- subvol = btrfs_alloc_free_block(trans, root);
+ subvol = btrfs_alloc_free_block(trans, root, 0);
if (subvol == NULL)
return -ENOSPC;
leaf = btrfs_buffer_leaf(subvol);
* insert the directory item
*/
key.offset = (u64)-1;
+ dir = root->fs_info->sb->s_root->d_inode;
ret = btrfs_insert_dir_item(trans, root->fs_info->tree_root,
- name, namelen,
- root->fs_info->sb->s_root->d_inode->i_ino,
- &key, 0);
+ name, namelen, dir->i_ino, &key, 0);
BUG_ON(ret);
ret = btrfs_commit_transaction(trans, root);
trans = btrfs_start_transaction(new_root, 1);
BUG_ON(!trans);
- inode = btrfs_new_inode(trans, new_root, new_dirid, S_IFDIR | 0700);
+ inode = btrfs_new_inode(trans, new_root, new_dirid,
+ BTRFS_I(dir)->block_group, S_IFDIR | 0700);
inode->i_op = &btrfs_dir_inode_operations;
inode->i_fop = &btrfs_dir_file_operations;
iput(inode);
mutex_unlock(&root->fs_info->fs_mutex);
+ btrfs_btree_balance_dirty(root);
return 0;
}
ret = btrfs_commit_transaction(trans, root);
BUG_ON(ret);
mutex_unlock(&root->fs_info->fs_mutex);
+ btrfs_btree_balance_dirty(root);
return 0;
}
mutex_unlock(&root->fs_info->fs_mutex);
out_nolock:
btrfs_free_path(path);
+ btrfs_btree_balance_dirty(root);
return ret;
}
{
struct btrfs_inode *ei = (struct btrfs_inode *) foo;
- if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
+ if ((flags & (SLAB_CTOR_CONSTRUCTOR)) ==
SLAB_CTOR_CONSTRUCTOR) {
inode_init_once(&ei->vfs_inode);
}
btrfs_fill_super, mnt);
}
-
static int btrfs_getattr(struct vfsmount *mnt,
struct dentry *dentry, struct kstat *stat)
{
return 0;
}
+static int btrfs_rename(struct inode * old_dir, struct dentry *old_dentry,
+ struct inode * new_dir,struct dentry *new_dentry)
+{
+ struct btrfs_trans_handle *trans;
+ struct btrfs_root *root = BTRFS_I(old_dir)->root;
+ struct inode *new_inode = new_dentry->d_inode;
+ struct inode *old_inode = old_dentry->d_inode;
+ struct timespec ctime = CURRENT_TIME;
+ struct btrfs_path *path;
+ struct btrfs_dir_item *di;
+ int ret;
+
+ if (S_ISDIR(old_inode->i_mode) && new_inode &&
+ new_inode->i_size > BTRFS_EMPTY_DIR_SIZE) {
+ return -ENOTEMPTY;
+ }
+ mutex_lock(&root->fs_info->fs_mutex);
+ trans = btrfs_start_transaction(root, 1);
+ btrfs_set_trans_block_group(trans, new_dir);
+ path = btrfs_alloc_path();
+ if (!path) {
+ ret = -ENOMEM;
+ goto out_fail;
+ }
+
+ old_dentry->d_inode->i_nlink++;
+ old_dir->i_ctime = old_dir->i_mtime = ctime;
+ new_dir->i_ctime = new_dir->i_mtime = ctime;
+ old_inode->i_ctime = ctime;
+ if (S_ISDIR(old_inode->i_mode) && old_dir != new_dir) {
+ struct btrfs_key *location = &BTRFS_I(new_dir)->location;
+ u64 old_parent_oid;
+ di = btrfs_lookup_dir_item(trans, root, path, old_inode->i_ino,
+ "..", 2, -1);
+ if (IS_ERR(di)) {
+ ret = PTR_ERR(di);
+ goto out_fail;
+ }
+ if (!di) {
+ ret = -ENOENT;
+ goto out_fail;
+ }
+ old_parent_oid = btrfs_disk_key_objectid(&di->location);
+ ret = btrfs_del_item(trans, root, path);
+ if (ret) {
+ ret = -EIO;
+ goto out_fail;
+ }
+ btrfs_release_path(root, path);
+
+ di = btrfs_lookup_dir_index_item(trans, root, path,
+ old_inode->i_ino,
+ old_parent_oid,
+ "..", 2, -1);
+ if (IS_ERR(di)) {
+ ret = PTR_ERR(di);
+ goto out_fail;
+ }
+ if (!di) {
+ ret = -ENOENT;
+ goto out_fail;
+ }
+ ret = btrfs_del_item(trans, root, path);
+ if (ret) {
+ ret = -EIO;
+ goto out_fail;
+ }
+ btrfs_release_path(root, path);
+
+ ret = btrfs_insert_dir_item(trans, root, "..", 2,
+ old_inode->i_ino, location, 0);
+ if (ret)
+ goto out_fail;
+ }
+
+
+ ret = btrfs_add_link(trans, new_dentry, old_inode);
+ if (ret == -EEXIST && new_inode)
+ ret = 0;
+ else if (ret)
+ goto out_fail;
+
+ ret = btrfs_unlink_trans(trans, root, old_dir, old_dentry);
+ if (ret)
+ goto out_fail;
+
+ if (new_inode) {
+ new_inode->i_ctime = CURRENT_TIME;
+ di = btrfs_lookup_dir_index_item(trans, root, path,
+ new_dir->i_ino,
+ new_inode->i_ino,
+ new_dentry->d_name.name,
+ new_dentry->d_name.len, -1);
+ if (di && !IS_ERR(di)) {
+ btrfs_del_item(trans, root, path);
+ btrfs_release_path(root, path);
+ }
+ if (S_ISDIR(new_inode->i_mode))
+ clear_nlink(new_inode);
+ else
+ drop_nlink(new_inode);
+ btrfs_update_inode(trans, root, new_inode);
+ }
+out_fail:
+ btrfs_free_path(path);
+ btrfs_end_transaction(trans, root);
+ mutex_unlock(&root->fs_info->fs_mutex);
+ return ret;
+}
+
static struct file_system_type btrfs_fs_type = {
.owner = THIS_MODULE,
.name = "btrfs",
.unlink = btrfs_unlink,
.mkdir = btrfs_mkdir,
.rmdir = btrfs_rmdir,
+ .rename = btrfs_rename,
};
static struct inode_operations btrfs_dir_ro_inode_operations = {
err = init_inodecache();
if (err)
return err;
- kset_set_kset_s(&btrfs_subsys, fs_subsys);
- err = subsystem_register(&btrfs_subsys);
- if (err)
- goto out;
return register_filesystem(&btrfs_fs_type);
-out:
destroy_inodecache();
return err;
}
{
destroy_inodecache();
unregister_filesystem(&btrfs_fs_type);
- subsystem_unregister(&btrfs_subsys);
printk("btrfs unloaded\n");
}
projects / deliverable / linux.git / blobdiff