From: Chris Mason <chris.mason@oracle.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "H. Peter Anvin" <h.peter.anvin@intel.com>
Subject: [GIT PULL] Btrfs pull for .34
Date: Mon, 8 Mar 2010 17:00:22 -0500 [thread overview]
Message-ID: <20100308220022.GB14976@think> (raw)
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(-)
reply other threads:[~2010-03-08 22:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100308220022.GB14976@think \
--to=chris.mason@oracle.com \
--cc=h.peter.anvin@intel.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.