| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 25 Feb 2011 22:03:39 +0000 (14:03 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 25 Feb 2011 22:03:39 +0000 (14:03 -0800) | ||
| commit | 4660ba63f1c4e07c20a435e084f12ba48a82bd2b | |
| tree | 494973a1dd4102eede20298f478574801af31b86 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61 | commit | diff |
| parent | ec29ed5b407d618a8128f5942aade9e1758aa14b | commit | 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
* 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
| fs/btrfs/ctree.h | diff1 | | diff2 | | blob | history |
| fs/btrfs/extent-tree.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/extent_io.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/inode.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/super.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/volumes.c | diff1 | | diff2 | | blob | history |