diff options
| author | Tsutomu Itoh <t-itoh@jp.fujitsu.com> | 2011-01-05 02:32:22 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-01-16 11:30:20 -0500 |
| commit | 91ca338d776e0cefb255bf2979b6448febd880f5 (patch) | |
| tree | 5d1d344d6ed565faf5612b5c695f00c04e6f01d8 /fs/btrfs/ctree.c | |
| parent | ff175d57f057f77d2d3031d674c2af9167a4af02 (diff) | |
| download | linux-3.10-91ca338d776e0cefb255bf2979b6448febd880f5.tar.gz linux-3.10-91ca338d776e0cefb255bf2979b6448febd880f5.tar.bz2 linux-3.10-91ca338d776e0cefb255bf2979b6448febd880f5.zip | |
btrfs: check NULL or not
Should check if functions returns NULL or not.
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 99599f1c155..b5baff0dccf 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -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); |