commit | 4660ba63f1c4e07c20a435e084f12ba48a82bd2b | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 25 14:03:39 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 25 14:03:39 2011 -0800 |
tree | 494973a1dd4102eede20298f478574801af31b86 | |
parent | 958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61 [diff] | |
parent | ec29ed5b407d618a8128f5942aade9e1758aa14b [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: fix fiemap bugs with delalloc Btrfs: set FMODE_EXCL in btrfs_device->mode Btrfs: make btrfs_rm_device() fail gracefully Btrfs: Avoid accessing unmapped kernel address Btrfs: Fix BTRFS_IOC_SUBVOL_SETFLAGS ioctl Btrfs: allow balance to explicitly allocate chunks as it relocates Btrfs: put ENOSPC debugging under a mount option