Hi Linus,
If you''re doing another RC, please grab these two. Otherwise
I''ll send
them off to -stable.
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus
This fixes a long standing problem where the btrfs scan ioctl was racing
with mkfs.btrfs and dropping dirty pages created by mkfs. It also fixes
a crash during tree log replay with quota enabled.
David Sterba (1) commits (+64/-6):
btrfs: access superblock via pagecache in scan_one_device
Arne Jansen (1) commits (+1/-1):
Btrfs: fix crash in log replay with qgroups enabled
Total: (2) commits (+65/-7)
fs/btrfs/ctree.c | 2 +-
fs/btrfs/volumes.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 65 insertions(+), 7 deletions(-)
Hi Linus,
Please grab my for-linus:
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus
These are scattered fixes and one performance improvement. The biggest
functional change is in how we throttle metadata changes. The new code
bumps our average file creation rate up by ~13% in fs_mark, and lowers
CPU usage.
Stefan bisected out a regression in our allocation code that made
balance loop on extents larger than 256MB.
Liu Bo (6) commits (+71/-19):
Btrfs: build up error handling for merge_reloc_roots (+35/-12)
Btrfs: check for NULL pointer in updating reloc roots (+2/-0)
Btrfs: avoid deadlock on transaction waiting list (+7/-0)
Btrfs: free all recorded tree blocks on error (+6/-3)
Btrfs: do not BUG_ON on aborted situation (+12/-3)
Btrfs: do not BUG_ON in prepare_to_reloc (+9/-1)
Chris Mason (2) commits (+96/-63):
Btrfs: enforce min_bytes parameter during extent allocation (+4/-2)
Btrfs: improve the delayed inode throttling (+92/-61)
Miao Xie (2) commits (+45/-39):
Btrfs: fix unclosed transaction handler when the async transaction
commitment fails (+4/-0)
Btrfs: fix wrong handle at error path of create_snapshot() when the commit
fails (+41/-39)
Stefan Behrens (1) commits (+0/-8):
Btrfs: allow running defrag in parallel to administrative tasks
Ilya Dryomov (1) commits (+5/-0):
Btrfs: fix a mismerge in btrfs_balance()
Josef Bacik (1) commits (+4/-1):
Btrfs: use set_nlink if our i_nlink is 0
Total: (13) commits (+221/-130)
fs/btrfs/delayed-inode.c | 151 ++++++++++++++++++++++++++++-------------------
fs/btrfs/delayed-inode.h | 2 +
fs/btrfs/disk-io.c | 16 +++--
fs/btrfs/inode.c | 6 +-
fs/btrfs/ioctl.c | 18 ++----
fs/btrfs/relocation.c | 74 +++++++++++++++++------
fs/btrfs/transaction.c | 65 ++++++++++++--------
fs/btrfs/tree-log.c | 5 +-
fs/btrfs/volumes.c | 14 ++++-
9 files changed, 221 insertions(+), 130 deletions(-)