| commit | 1acc9309eb2674533944f48dbaaa53e7750e3947 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 9 Jul 2011 06:25:45 +0000 (8 23:25 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 9 Jul 2011 06:25:45 +0000 (8 23:25 -0700) | ||
| tree | 255f346c01a33906b612852d5fb008da1f4520da | treesnapshot (tar.gz zip) |
| parent | c2d197e82b6267fd3338f3fbcb12750ca9f5abda | commitdiff |
| parent | 149e2d76b4886c4c7ff5e077646a8ba3563c8026 | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
btrfs: fix oops when doing space balance
Btrfs: don't panic if we get an error while balancing V2
btrfs: add missing options displayed in mount output
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
btrfs: fix oops when doing space balance
Btrfs: don't panic if we get an error while balancing V2
btrfs: add missing options displayed in mount output
| fs/btrfs/ctree.h | diff1 | diff2 | blobhistory |
| fs/btrfs/inode.c | diff1 | diff2 | blobhistory |
| fs/btrfs/super.c | diff1 | diff2 | blobhistory |