diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-17 00:15:50 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-17 00:15:50 +0400 |
| commit | c9a7fe9672612c0b595633d2945f52257ad92b20 (patch) | |
| tree | df251545a12fdbb895c07ec9dccde10163624b7f | |
| parent | 2cfab8d74ebfbe06ce2947117945c4f45a5915ec (diff) | |
| parent | d85c8a6f1bc083279215ff6e79b7c292bf3ec905 (diff) | |
| parent | 142349f541d0bb6bc3e0d4563268105aada42b0b (diff) | |
| download | linux-c9a7fe9672612c0b595633d2945f52257ad92b20.tar.xz | |
Merge branches 'for-linus' and 'for-linus-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: unplug every once and a while
Btrfs: deal with NULL srv_rsv in the delalloc inode reservation code
Btrfs: only set cache_generation if we setup the block group
Btrfs: don't panic if orphan item already exists
Btrfs: fix leaked space in truncate
Btrfs: fix how we do delalloc reservations and how we free reservations on error
Btrfs: deal with enospc from dirtying inodes properly
Btrfs: fix num_workers_starting bug and other bugs in async thread
BTRFS: Establish i_ops before calling d_instantiate
Btrfs: add a cond_resched() into the worker loop
Btrfs: fix ctime update of on-disk inode
btrfs: keep orphans for subvolume deletion
Btrfs: fix inaccurate available space on raid0 profile
Btrfs: fix wrong disk space information of the files
Btrfs: fix wrong i_size when truncating a file to a larger size
Btrfs: fix btrfs_end_bio to deal with write errors to a single mirror
* 'for-linus-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: lower the dirty balance poll interval