From 2c78f9d05be0e449b49bfe633f5a39f88f5d7b24 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Thu, 14 Jul 2011 21:23:06 +0000 Subject: [PATCH] --- yaml --- r: 262237 b: refs/heads/master c: bf5f32ecb6caac52b4d1c083251b3dd4f40a0b7a h: refs/heads/master i: 262235: 6cef01e8db303656b55f39068b917616b89bfb52 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/ctree.h | 4 ++-- trunk/fs/btrfs/root-tree.c | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index df551b6e733d..25de9c378551 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff1f2b4407454d926d8b143bf37e4dce66026a28 +refs/heads/master: bf5f32ecb6caac52b4d1c083251b3dd4f40a0b7a diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h index 7ac4d25fd4f8..34ce4140bb41 100644 --- a/trunk/fs/btrfs/ctree.h +++ b/trunk/fs/btrfs/ctree.h @@ -2406,8 +2406,8 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct btrfs_root_item *item, struct btrfs_key *key); int btrfs_find_dead_roots(struct btrfs_root *root, u64 objectid); int btrfs_find_orphan_roots(struct btrfs_root *tree_root); -int btrfs_set_root_node(struct btrfs_root_item *item, - struct extent_buffer *node); +void btrfs_set_root_node(struct btrfs_root_item *item, + struct extent_buffer *node); void btrfs_check_and_init_root_item(struct btrfs_root_item *item); /* dir-item.c */ diff --git a/trunk/fs/btrfs/root-tree.c b/trunk/fs/btrfs/root-tree.c index ebe45443de06..f4099904565a 100644 --- a/trunk/fs/btrfs/root-tree.c +++ b/trunk/fs/btrfs/root-tree.c @@ -71,13 +71,12 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, return ret; } -int btrfs_set_root_node(struct btrfs_root_item *item, - struct extent_buffer *node) +void btrfs_set_root_node(struct btrfs_root_item *item, + struct extent_buffer *node) { btrfs_set_root_bytenr(item, node->start); btrfs_set_root_level(item, btrfs_header_level(node)); btrfs_set_root_generation(item, btrfs_header_generation(node)); - return 0; } /*