diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 14:07:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 14:07:53 -0800 |
| commit | 51d0f6d1f50349579f007adf5c0b51aaedd93b94 (patch) | |
| tree | 6ea3f2683c3017d63101e708309665727eb2a7cc /fs/btrfs/extent_map.c | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
| parent | da495ecc0fb096b383754952a1c152147bc95b52 (diff) | |
| download | linux-51d0f6d1f50349579f007adf5c0b51aaedd93b94.tar.gz linux-51d0f6d1f50349579f007adf5c0b51aaedd93b94.tar.bz2 linux-51d0f6d1f50349579f007adf5c0b51aaedd93b94.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: kfree correct pointer during mount option parsing
Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL
Diffstat (limited to 'fs/btrfs/extent_map.c')
| -rw-r--r-- | fs/btrfs/extent_map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 428fcac45f90..28d87ba60ce8 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -35,7 +35,7 @@ void extent_map_exit(void) */ void extent_map_tree_init(struct extent_map_tree *tree, gfp_t mask) { - tree->map.rb_node = NULL; + tree->map = RB_ROOT; rwlock_init(&tree->lock); } |