diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-09 01:07:53 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-09 01:07:53 +0300 |
| commit | 51d0f6d1f50349579f007adf5c0b51aaedd93b94 (patch) | |
| tree | 6ea3f2683c3017d63101e708309665727eb2a7cc /fs/btrfs/extent_io.c | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
| parent | da495ecc0fb096b383754952a1c152147bc95b52 (diff) | |
| download | linux-51d0f6d1f50349579f007adf5c0b51aaedd93b94.tar.xz | |
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_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index b177ed319612..7073cbb1b2d4 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -104,8 +104,8 @@ void extent_io_exit(void) void extent_io_tree_init(struct extent_io_tree *tree, struct address_space *mapping, gfp_t mask) { - tree->state.rb_node = NULL; - tree->buffer.rb_node = NULL; + tree->state = RB_ROOT; + tree->buffer = RB_ROOT; tree->ops = NULL; tree->dirty_bytes = 0; spin_lock_init(&tree->lock); |