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/extent-tree.c | |
| parent | 261cd298a8c363d7985e3482946edb4bfedacf98 (diff) | |
| parent | c26a920373a983b52223eed5a13b97404d8b4158 (diff) | |
| download | linux-007a14af2649c9ac77f38cd23469518ffb8b355a.tar.gz linux-007a14af2649c9ac77f38cd23469518ffb8b355a.tar.bz2 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/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 4e7e012ad667..f3c96fc01439 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -6583,7 +6583,7 @@ static noinline int relocate_data_extent(struct inode *reloc_inode, u64 end = start + extent_key->offset - 1; em = alloc_extent_map(GFP_NOFS); - BUG_ON(!em || IS_ERR(em)); + BUG_ON(!em); em->start = start; em->len = extent_key->offset; |