From: Chris Mason <clm@fb.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: [GIT PULL] Btrfs part two
Date: Fri, 11 Apr 2014 12:50:26 -0400 [thread overview]
Message-ID: <53481D52.5070608@fb.com> (raw)
Hi Linus,
Please grab my for-linus branch:
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus
The most important changes here are from Josef, fixing a btrfs
regression in 3.14 that can cause corruptions in the extent allocation
tree when snapshots are in use. Josef also fixed some deadlocks in
send/recv and other assorted races when balance is running.
Josef Bacik (6) commits (+147/-228):
Btrfs: hold the commit_root_sem when getting the commit root during send (+39/-16)
Btrfs: abort the transaction when we don't find our extent ref (+2/-0)
Btrfs: do not reset last_snapshot after relocation (+0/-21)
Btrfs: don't clear uptodate if the eb is under IO (+27/-3)
Btrfs: check for an extent_op on the locked ref (+2/-1)
Btrfs: remove transaction from send (+77/-187)
Wang Shilong (5) commits (+122/-24):
Btrfs: fix compile warnings on on avr32 platform (+1/-1)
Btrfs: fix unlock in __start_delalloc_inodes() (+3/-2)
Btrfs: scrub raid56 stripes in the right way (+89/-19)
Btrfs: don't compress for a small write (+8/-0)
Btrfs: fix snapshot vs nocow writting (+21/-2)
Filipe Manana (3) commits (+11/-5):
Btrfs: send, fix data corruption due to incorrect hole detection (+3/-1)
Btrfs: more efficient io tree navigation on wait_extent_bit (+5/-1)
Btrfs: send, build path string only once in send_hole (+3/-3)
David Sterba (2) commits (+52/-12):
btrfs: export global block reserve size as space_info (+28/-1)
btrfs: make device scan less noisy (+24/-11)
Sergei Trofimovich (1) commits (+2/-0):
btrfs: fix crash in remount(thread_pool=) case
Jeff Mahoney (1) commits (+7/-3):
btrfs: fix lockdep warning with reclaim lock inversion
Gui Hecheng (1) commits (+3/-2):
btrfs: filter invalid arg for btrfs resize
Harald Hoyer (1) commits (+22/-0):
btrfs: allow mounting btrfs subvolumes with different ro/rw options
Chris Mason (1) commits (+3/-2):
Btrfs: fix EINVAL checks in btrfs_clone
Qu Wenruo (1) commits (+4/-1):
btrfs: Change the expanding write sequence to fix snapshot related bug.
Dan Carpenter (1) commits (+2/-3):
Btrfs: kmalloc() doesn't return an ERR_PTR
Total: (23) commits
fs/btrfs/async-thread.c | 2 +
fs/btrfs/backref.c | 33 +++++++++++---
fs/btrfs/ctree.c | 94 +++-----------------------------------
fs/btrfs/ctree.h | 13 ++++--
fs/btrfs/disk-io.c | 23 ++++++++--
fs/btrfs/extent-tree.c | 35 +++++++++------
fs/btrfs/extent_io.c | 8 +++-
fs/btrfs/extent_io.h | 1 +
fs/btrfs/file.c | 5 ++-
fs/btrfs/inode-map.c | 14 +++---
fs/btrfs/inode.c | 36 +++++++++++++--
fs/btrfs/ioctl.c | 35 ++++++++++++---
fs/btrfs/relocation.c | 21 ---------
fs/btrfs/scrub.c | 108 ++++++++++++++++++++++++++++++++++++--------
fs/btrfs/send.c | 117 +++++++++++++++++-------------------------------
fs/btrfs/super.c | 22 +++++++++
fs/btrfs/transaction.c | 48 ++++++++++++--------
fs/btrfs/transaction.h | 3 ++
fs/btrfs/volumes.c | 35 ++++++++++-----
19 files changed, 374 insertions(+), 279 deletions(-)
next reply other threads:[~2014-04-11 16:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-11 16:50 Chris Mason [this message]
2014-04-12 1:27 ` [GIT PULL] Btrfs part two Chris Samuel
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=53481D52.5070608@fb.com \
--to=clm@fb.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.