* [GIT PULL] Btrfs pull for .34
@ 2010-03-08 22:00 Chris Mason
0 siblings, 0 replies; only message in thread
From: Chris Mason @ 2010-03-08 22:00 UTC (permalink / raw)
To: Linus Torvalds, linux-btrfs, linux-kernel; +Cc: H. Peter Anvin
Hi everyone,
This merge window conflicted with my spring break skiing window, so this
pull request is very very short. I have a larger one in testing but
really wanted to get this out.
Linus, please pull the btrfs-unstable master branch:
git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git master
The RB_ROOT patch changes btrfs to use the proper rbtree initializer,
and Josef's patch fixes a memory corruption during btrfs mount.
Eric Paris (1) commits (+12/-12):
Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL
Josef Bacik (1) commits (+3/-2):
Btrfs: kfree correct pointer during mount option parsing
Total: (2) commits
fs/btrfs/disk-io.c | 4 ++--
fs/btrfs/extent_io.c | 4 ++--
fs/btrfs/extent_map.c | 2 +-
fs/btrfs/free-space-cache.c | 4 ++--
fs/btrfs/ordered-data.h | 2 +-
fs/btrfs/ref-cache.h | 2 +-
fs/btrfs/relocation.c | 4 ++--
fs/btrfs/super.c | 5 +++--
fs/btrfs/transaction.c | 2 +-
9 files changed, 15 insertions(+), 14 deletions(-)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-08 22:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-08 22:00 [GIT PULL] Btrfs pull for .34 Chris Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.