| commit | adbfbcd12af3d183957622a99ca009b665639b81 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 05 07:23:03 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 05 07:23:03 2010 -0800 |
| tree | 830e5cc6a0dbd5cb590b8484c4234bd65073d1d7 | |
| parent | fc76be434d90bcd57a0ea6b93a2e66a3fec4b664 [diff] | |
| parent | 23b5c50945f2294add0137799400329c0ebba290 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: apply updated fallocate i_size fix Btrfs: do not try and lookup the file extent when finishing ordered io Btrfs: Fix oopsen when dropping empty tree. Btrfs: remove BUG_ON() due to mounting bad filesystem Btrfs: make error return negative in btrfs_sync_file() Btrfs: fix race between allocate and release extent buffer.