Skip to content

Commit

Permalink
btrfs: checking NULL or not in some functions
Browse files Browse the repository at this point in the history
Because NULL is returned when the memory allocation fails,
it is checked whether it is NULL.

Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Tsutomu Itoh authored and Chris Mason committed Feb 1, 2011
1 parent c87fb6f commit 5df6708
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -6496,6 +6496,8 @@ static noinline int relocate_inode_pages(struct inode *inode, u64 start,
int ret = 0;

ra = kzalloc(sizeof(*ra), GFP_NOFS);
if (!ra)
return -ENOMEM;

mutex_lock(&inode->i_mutex);
first_index = start >> PAGE_CACHE_SHIFT;
Expand Down
2 changes: 2 additions & 0 deletions fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -1920,6 +1920,8 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree,
nr = bio_get_nr_vecs(bdev);

bio = btrfs_bio_alloc(bdev, sector, nr, GFP_NOFS | __GFP_HIGH);
if (!bio)
return -ENOMEM;

bio_add_page(bio, page, page_size, offset);
bio->bi_end_io = end_io_func;
Expand Down
6 changes: 6 additions & 0 deletions fs/btrfs/tree-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -2751,7 +2751,13 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
log = root->log_root;

path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
dst_path = btrfs_alloc_path();
if (!dst_path) {
btrfs_free_path(path);
return -ENOMEM;
}

min_key.objectid = inode->i_ino;
min_key.type = BTRFS_INODE_ITEM_KEY;
Expand Down

0 comments on commit 5df6708

Please sign in to comment.