marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few update for btrfs-progs 

Hello,

This patch adds inode flags definition to btrfs-progs and updates
extent-tree.c to match the kernel.
master
Yan 2008-01-08 15:55:08 -05:00 committed by David Woodhouse
parent ba1efed418
commit b86a827172
2 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ctree.h
View File

@ -415,8 +415,11 @@ struct btrfs_root {
* data in the FS * data in the FS
*/ */
#define BTRFS_STRING_ITEM_KEY 253 #define BTRFS_STRING_ITEM_KEY 253
/*
* Inode flags
*/
#define BTRFS_INODE_NODATASUM 0x1
#define BTRFS_INODE_NODATACOW 0x2
#define read_eb_member(eb, ptr, type, member, result) ( \ #define read_eb_member(eb, ptr, type, member, result) ( \
read_extent_buffer(eb, (char *)(result), \ read_extent_buffer(eb, (char *)(result), \
((unsigned long)(ptr)) + \ ((unsigned long)(ptr)) + \

79
extent-tree.c
View File

@ -34,7 +34,28 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, struct
btrfs_root *extent_root); btrfs_root *extent_root);
static int del_pending_extents(struct btrfs_trans_handle *trans, struct static int del_pending_extents(struct btrfs_trans_handle *trans, struct
btrfs_root *extent_root); btrfs_root *extent_root);
static int find_previous_extent(struct btrfs_root *root,
struct btrfs_path *path)
{
struct btrfs_key found_key;
struct extent_buffer *leaf;
int ret;
while(1) {
if (path->slots[0] == 0) {
ret = btrfs_prev_leaf(root, path);
if (ret != 0)
return ret;
} else {
path->slots[0]--;
}
leaf = path->nodes[0];
btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
if (found_key.type == BTRFS_EXTENT_ITEM_KEY)
return 0;
}
return 1;
}
static int cache_block_group(struct btrfs_root *root, static int cache_block_group(struct btrfs_root *root,
struct btrfs_block_group_cache *block_group) struct btrfs_block_group_cache *block_group)
{ {
@ -66,16 +87,19 @@ static int cache_block_group(struct btrfs_root *root,
first_free = block_group->key.objectid; first_free = block_group->key.objectid;
key.objectid = block_group->key.objectid; key.objectid = block_group->key.objectid;
key.offset = 0; key.offset = 0;
btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = find_previous_extent(root, path);
if (ret && path->slots[0] > 0) if (ret < 0)
path->slots[0]--; return ret;
if (ret == 0) {
leaf = path->nodes[0];
btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
if (key.objectid + key.offset > first_free)
first_free = key.objectid + key.offset;
}
while(1) { while(1) {
leaf = path->nodes[0]; leaf = path->nodes[0];
slot = path->slots[0]; slot = path->slots[0];
@ -89,15 +113,10 @@ static int cache_block_group(struct btrfs_root *root,
break; break;
} }
} }
btrfs_item_key_to_cpu(leaf, &key, slot); btrfs_item_key_to_cpu(leaf, &key, slot);
if (key.objectid < block_group->key.objectid) { if (key.objectid < block_group->key.objectid) {
if (btrfs_key_type(&key) != BTRFS_EXTENT_REF_KEY &&
key.objectid + key.offset > first_free)
first_free = key.objectid + key.offset;
goto next; goto next;
} }
if (key.objectid >= block_group->key.objectid + if (key.objectid >= block_group->key.objectid +
block_group->key.offset) { block_group->key.offset) {
break; break;
@ -163,11 +182,9 @@ struct btrfs_block_group_cache *btrfs_lookup_block_group(struct
return block_group; return block_group;
return NULL; return NULL;
} }
static u64 noinline find_search_start(struct btrfs_root *root, static u64 noinline find_search_start(struct btrfs_root *root,
struct btrfs_block_group_cache **cache_ret, struct btrfs_block_group_cache **cache_ret,
u64 search_start, int num, u64 search_start, int num, int data)
int data, int full_scan)
{ {
int ret; int ret;
struct btrfs_block_group_cache *cache = *cache_ret; struct btrfs_block_group_cache *cache = *cache_ret;
@ -772,9 +789,7 @@ again:
out: out:
btrfs_free_path(path); btrfs_free_path(path);
return total_count; return total_count;
} }
int btrfs_inc_root_ref(struct btrfs_trans_handle *trans, int btrfs_inc_root_ref(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 owner_objectid) struct btrfs_root *root, u64 owner_objectid)
{ {
@ -1426,7 +1441,7 @@ check_failed:
orig_search_start); orig_search_start);
} }
search_start = find_search_start(root, &block_group, search_start, search_start = find_search_start(root, &block_group, search_start,
total_needed, data, full_scan); total_needed, data);
search_start = stripe_align(root, search_start); search_start = stripe_align(root, search_start);
cached_start = search_start; cached_start = search_start;
btrfs_init_path(path); btrfs_init_path(path);
@ -1438,35 +1453,11 @@ check_failed:
ret = btrfs_search_slot(trans, root, ins, path, 0, 0); ret = btrfs_search_slot(trans, root, ins, path, 0, 0);
if (ret < 0) if (ret < 0)
goto error; goto error;
ret = find_previous_extent(root, path);
if (path->slots[0] > 0) { if (ret < 0)
path->slots[0]--; goto error;
}
l = path->nodes[0]; l = path->nodes[0];
btrfs_item_key_to_cpu(l, &key, path->slots[0]); btrfs_item_key_to_cpu(l, &key, path->slots[0]);
/*
* walk backwards to find the first extent item key
*/
while(btrfs_key_type(&key) != BTRFS_EXTENT_ITEM_KEY) {
if (path->slots[0] == 0) {
ret = btrfs_prev_leaf(root, path);
if (ret != 0) {
ret = btrfs_search_slot(trans, root, ins,
path, 0, 0);
if (ret < 0)
goto error;
if (path->slots[0] > 0)
path->slots[0]--;
break;
}
} else {
path->slots[0]--;
}
l = path->nodes[0];
btrfs_item_key_to_cpu(l, &key, path->slots[0]);
}
while (1) { while (1) {
l = path->nodes[0]; l = path->nodes[0];
slot = path->slots[0]; slot = path->slots[0];