From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Mar 2010 22:07:53 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v2.6.34-rc2~278
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/51d0f6d1f50349579f007adf5c0b51aaedd93b94?hp=-c

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
---

51d0f6d1f50349579f007adf5c0b51aaedd93b94
diff --combined fs/btrfs/extent_map.c
index 428fcac45f90,5a01f35507dd..28d87ba60ce8
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@@ -35,7 -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);
  }
  
@@@ -242,7 -242,7 +242,7 @@@ out
   * Insert @em into @tree or perform a simple forward/backward merge with
   * existing mappings.  The extent_map struct passed in will be inserted
   * into the tree directly, with an additional reference taken, or a
 - * reference dropped if the merge attempt was sucessfull.
 + * reference dropped if the merge attempt was successfull.
   */
  int add_extent_mapping(struct extent_map_tree *tree,
  		       struct extent_map *em)