diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-08 17:33:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-08 17:33:20 -0800 |
| commit | 0aefda3e8188ad71168bd32152d41b3d72f04087 (patch) | |
| tree | b0f57efd9dd5d7993ea9b3ff45842f5f1bd6d06c /drivers/input/touchscreen/atmel_mxt_ts.c | |
| parent | Platform: x86: chromeos_laptop : Add basic platform data for atmel devices (diff) | |
| parent | Btrfs: improve the delayed inode throttling (diff) | |
| download | linux-dev-0aefda3e8188ad71168bd32152d41b3d72f04087.tar.xz linux-dev-0aefda3e8188ad71168bd32152d41b3d72f04087.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"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."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: improve the delayed inode throttling
Btrfs: fix a mismerge in btrfs_balance()
Btrfs: enforce min_bytes parameter during extent allocation
Btrfs: allow running defrag in parallel to administrative tasks
Btrfs: avoid deadlock on transaction waiting list
Btrfs: do not BUG_ON on aborted situation
Btrfs: do not BUG_ON in prepare_to_reloc
Btrfs: free all recorded tree blocks on error
Btrfs: build up error handling for merge_reloc_roots
Btrfs: check for NULL pointer in updating reloc roots
Btrfs: fix unclosed transaction handler when the async transaction commitment fails
Btrfs: fix wrong handle at error path of create_snapshot() when the commit fails
Btrfs: use set_nlink if our i_nlink is 0
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions