| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 1 Dec 2011 16:28:53 +0000 (08:28 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 1 Dec 2011 16:28:53 +0000 (08:28 -0800) | ||
| commit | b930c26416c4ea6855726fd977145ccea9afbdda | |
| tree | ae18b550c5918ba36f92d0971cc7f2cc8918a05d | tree | snapshot (tar.xz tar.gz zip) |
| parent | 11d814a20166461358e1cefaf6bcd425698b8460 | commit | diff |
| parent | f4a8e6563ea5366f563cb741a27fe90c5fa7f0fc | commit | diff |
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix meta data raid-repair merge problem
Btrfs: skip allocation attempt from empty cluster
Btrfs: skip block groups without enough space for a cluster
Btrfs: start search for new cluster at the beginning
Btrfs: reset cluster's max_size when creating bitmap
Btrfs: initialize new bitmaps' list
Btrfs: fix oops when calling statfs on readonly device
Btrfs: Don't error on resizing FS to same size
Btrfs: fix deadlock on metadata reservation when evicting a inode
Fix URL of btrfs-progs git repository in docs
btrfs scrub: handle -ENOMEM from init_ipath()
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix meta data raid-repair merge problem
Btrfs: skip allocation attempt from empty cluster
Btrfs: skip block groups without enough space for a cluster
Btrfs: start search for new cluster at the beginning
Btrfs: reset cluster's max_size when creating bitmap
Btrfs: initialize new bitmaps' list
Btrfs: fix oops when calling statfs on readonly device
Btrfs: Don't error on resizing FS to same size
Btrfs: fix deadlock on metadata reservation when evicting a inode
Fix URL of btrfs-progs git repository in docs
btrfs scrub: handle -ENOMEM from init_ipath()
| fs/btrfs/extent-tree.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/inode.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/super.c | diff1 | | diff2 | | blob | history |