Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91ca338d authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by Chris Mason
Browse files

btrfs: check NULL or not 



Should check if functions returns NULL or not.

Signed-off-by: default avatarTsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent ff175d57

fs/btrfs/ctree.c

+6 −0
Original line number Diff line number Diff line
@@ -2516,6 +2516,9 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root 
	btrfs_assert_tree_locked(path->nodes[1]);



	right = read_node_slot(root, upper, slot + 1);

	if (right == NULL)

		return 1;



	btrfs_tree_lock(right);

	btrfs_set_lock_blocking(right);
@@ -2766,6 +2769,9 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root 
	btrfs_assert_tree_locked(path->nodes[1]);



	left = read_node_slot(root, path->nodes[1], slot - 1);

	if (left == NULL)

		return 1;



	btrfs_tree_lock(left);

	btrfs_set_lock_blocking(left);

fs/btrfs/disk-io.c

+8 −0
Original line number Diff line number Diff line
@@ -353,6 +353,10 @@ static int csum_dirty_buffer(struct btrfs_root *root, struct page *page) 
	WARN_ON(len == 0);



	eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);

	if (eb == NULL) {

		WARN_ON(1);

		goto out;

	}

	ret = btree_read_extent_buffer_pages(root, eb, start + PAGE_CACHE_SIZE,

					     btrfs_header_generation(eb));

	BUG_ON(ret);
@@ -427,6 +431,10 @@ static int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end, 
	WARN_ON(len == 0);



	eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);

	if (eb == NULL) {

		ret = -EIO;

		goto out;

	}



	found_start = btrfs_header_bytenr(eb);

	if (found_start != start) {

fs/btrfs/extent_io.c

+2 −0
Original line number Diff line number Diff line
@@ -3075,6 +3075,8 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree, 
#endif



	eb = kmem_cache_zalloc(extent_buffer_cache, mask);

	if (eb == NULL)

		return NULL;

	eb->start = start;

	eb->len = len;

	spin_lock_init(&eb->lock);