diff options
| author | Linus Torvalds | 2011-07-27 16:43:52 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-07-27 16:43:52 -0700 |
| commit | 22712200e175e0df5c7f9edfe6c6bf5c94c23b83 (patch) | |
| tree | a3e332aab7f5a953ff4f12e67af2a0e5f32f5be5 /fs/lockd | |
| parent | 597a67e0ba758e3d2239c81fbb648c6e69ec30a2 (diff) | |
| parent | ff95acb6733d41a8d45feb0e18b96df25e610e78 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: make sure reserve_metadata_bytes doesn't leak out strange errors
Btrfs: use the commit_root for reading free_space_inode crcs
Btrfs: reduce extent_state lock contention for metadata
Btrfs: remove lockdep magic from btrfs_next_leaf
Btrfs: make a lockdep class for each root
Btrfs: switch the btrfs tree locks to reader/writer
Btrfs: fix deadlock when throttling transactions
Btrfs: stop using highmem for extent_buffers
Btrfs: fix BUG_ON() caused by ENOSPC when relocating space
Btrfs: tag pages for writeback in sync
Btrfs: fix enospc problems with delalloc
Btrfs: don't flush delalloc arbitrarily
Btrfs: use find_or_create_page instead of grab_cache_page
Btrfs: use a worker thread to do caching
Btrfs: fix how we merge extent states and deal with cached states
Btrfs: use the normal checksumming infrastructure for free space cache
Btrfs: serialize flushers in reserve_metadata_bytes
Btrfs: do transaction space reservation before joining the transaction
Btrfs: try to only do one btrfs_search_slot in do_setxattr
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions