diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-05 06:17:23 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-05 06:17:23 +0900 |
commit | e6ece70732b905742ad91a7b5489e0ca1362c0cd (patch) | |
tree | 1ded331dec1886cf5b30bd6c6181787b8f237008 /fs/ocfs2 | |
parent | 23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159 (diff) | |
parent | aa0467d8d2a00e75b2bb6a56a4ee6d70c5d1928f (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: (25 commits)
btrfs: fix uninitialized variable warning
btrfs: add helper for fs_info->closing
Btrfs: add mount -o inode_cache
btrfs: scrub: add explicit plugging
btrfs: use btrfs_ino to access inode number
Btrfs: don't save the inode cache if we are deleting this root
btrfs: false BUG_ON when degraded
Btrfs: don't save the inode cache in non-FS roots
Btrfs: make sure we don't overflow the free space cache crc page
Btrfs: fix uninit variable in the delayed inode code
btrfs: scrub: don't reuse bios and pages
Btrfs: leave spinning on lookup and map the leaf
Btrfs: check for duplicate entries in the free space cache
Btrfs: don't try to allocate from a block group that doesn't have enough space
Btrfs: don't always do readahead
Btrfs: try not to sleep as much when doing slow caching
Btrfs: kill BTRFS_I(inode)->block_group
Btrfs: don't look at the extent buffer level 3 times in a row
Btrfs: map the node block when looking for readahead targets
Btrfs: set range_start to the right start in count_range_bits
...
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions