author | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 15 Feb 2011 16:00:35 +0000 (08:00 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 15 Feb 2011 16:00:35 +0000 (08:00 -0800) |
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: check return value of alloc_extent_map()
Btrfs - Fix memory leak in btrfs_init_new_device()
btrfs: prevent heap corruption in btrfs_ioctl_space_info()
Btrfs: Fix balance panic
Btrfs: don't release pages when we can't clear the uptodate bits
Btrfs: fix page->private races
Btrfs: check return value of alloc_extent_map()
Btrfs - Fix memory leak in btrfs_init_new_device()
btrfs: prevent heap corruption in btrfs_ioctl_space_info()
Btrfs: Fix balance panic
Btrfs: don't release pages when we can't clear the uptodate bits
Btrfs: fix page->private races
1 | 2 | |||
---|---|---|---|---|
fs/btrfs/disk-io.c | patch | | diff1 | | diff2 | | blob | history |
fs/btrfs/extent-tree.c | patch | | diff1 | | diff2 | | blob | history |
fs/btrfs/extent_io.c | patch | | diff1 | | diff2 | | blob | history |
fs/btrfs/file.c | patch | | diff1 | | diff2 | | blob | history |
fs/btrfs/inode.c | patch | | diff1 | | diff2 | | blob | history |
fs/btrfs/volumes.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc fs/btrfs/disk-io.c
Simple merge
diff --cc fs/btrfs/extent-tree.c
Simple merge
diff --cc fs/btrfs/extent_io.c
Simple merge
diff --cc fs/btrfs/file.c
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge