diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 08:00:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 08:00:35 -0800 |
| commit | 007a14af2649c9ac77f38cd23469518ffb8b355a (patch) | |
| tree | d6bc4477c11d7c8fd892f059acf0fc1ed547ba52 /fs/btrfs/file.c | |
| parent | 261cd298a8c363d7985e3482946edb4bfedacf98 (diff) | |
| parent | c26a920373a983b52223eed5a13b97404d8b4158 (diff) | |
| download | blackbird-op-linux-007a14af2649c9ac77f38cd23469518ffb8b355a.tar.gz blackbird-op-linux-007a14af2649c9ac77f38cd23469518ffb8b355a.zip | |
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: 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
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index c1d3a818731a..7084140d5940 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -186,6 +186,7 @@ int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end, split = alloc_extent_map(GFP_NOFS); if (!split2) split2 = alloc_extent_map(GFP_NOFS); + BUG_ON(!split || !split2); write_lock(&em_tree->lock); em = lookup_extent_mapping(em_tree, start, len); |
