diff options
author | Tsutomu Itoh <t-itoh@jp.fujitsu.com> | 2011-02-14 01:45:29 +0100 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2011-02-14 22:21:37 +0100 |
commit | c26a920373a983b52223eed5a13b97404d8b4158 (patch) | |
tree | a7f76fe1b0cecbc712f0b152ff537805f126b113 /fs/btrfs/inode.c | |
parent | Btrfs - Fix memory leak in btrfs_init_new_device() (diff) | |
download | linux-c26a920373a983b52223eed5a13b97404d8b4158.tar.xz linux-c26a920373a983b52223eed5a13b97404d8b4158.zip |
Btrfs: check return value of alloc_extent_map()
I add the check on the return value of alloc_extent_map() to several places.
In addition, alloc_extent_map() returns only the address or NULL.
Therefore, check by IS_ERR() is unnecessary. So, I remove IS_ERR() checking.
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to '')
-rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index c9bc0afdbfc6..8d392ed73d57 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -644,6 +644,7 @@ retry: async_extent->ram_size - 1, 0); em = alloc_extent_map(GFP_NOFS); + BUG_ON(!em); em->start = async_extent->start; em->len = async_extent->ram_size; em->orig_start = em->start; @@ -820,6 +821,7 @@ static noinline int cow_file_range(struct inode *inode, BUG_ON(ret); em = alloc_extent_map(GFP_NOFS); + BUG_ON(!em); em->start = start; em->orig_start = em->start; ram_size = ins.offset; @@ -1169,6 +1171,7 @@ out_check: struct extent_map_tree *em_tree; em_tree = &BTRFS_I(inode)->extent_tree; em = alloc_extent_map(GFP_NOFS); + BUG_ON(!em); em->start = cur_offset; em->orig_start = em->start; em->len = num_bytes; |