diff options
| author | Filipe David Borba Manana <fdmanana@gmail.com> | 2013-07-30 12:09:55 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2013-08-09 14:32:37 +0200 |
| commit | 2b2201bd094dd1d8d0ab2d119f36e107591f10c1 (patch) | |
| tree | 19d2d82883076b5d7c486ac381fa36c3b567d1dd | |
| parent | af6c1650cf38395143157a674344e195d47c0517 (diff) | |
| download | btrfs-progs-2b2201bd094dd1d8d0ab2d119f36e107591f10c1.tar.gz | |
Btrfs-progs: add missing path alloc return value check
Also remove unused path in extent-tree.c:finish_current_insert().
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Reviewed-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
| -rw-r--r-- | btrfs-corrupt-block.c | 2 | ||||
| -rw-r--r-- | cmds-check.c | 2 | ||||
| -rw-r--r-- | dir-item.c | 2 | ||||
| -rw-r--r-- | extent-tree.c | 8 | ||||
| -rw-r--r-- | file-item.c | 2 | ||||
| -rw-r--r-- | root-tree.c | 2 |
6 files changed, 14 insertions, 4 deletions
diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 481b7b8..4478f23 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -163,6 +163,8 @@ static int corrupt_extent(struct btrfs_trans_handle *trans, int should_del = rand() % 3; path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; key.objectid = bytenr; key.type = (u8)-1; diff --git a/cmds-check.c b/cmds-check.c index 5349d4b..3f913ce 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -4569,6 +4569,8 @@ static int fixup_extent_refs(struct btrfs_trans_handle *trans, flags = BTRFS_BLOCK_FLAG_FULL_BACKREF; path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; /* step one, make sure all of the backrefs agree */ ret = verify_backrefs(trans, info, path, rec); @@ -123,6 +123,8 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); key.offset = btrfs_name_hash(name, name_len); path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; data_size = sizeof(*dir_item) + name_len; dir_item = insert_with_overflow(trans, root, path, &key, data_size, name, name_len); diff --git a/extent-tree.c b/extent-tree.c index 9f1ca60..35fd82e 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1483,6 +1483,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, } path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; path->reada = 1; key.objectid = bytenr; @@ -1574,6 +1576,8 @@ int btrfs_set_block_flags(struct btrfs_trans_handle *trans, BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA); path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; path->reada = 1; key.objectid = bytenr; @@ -2075,7 +2079,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, u64 end; u64 priv; struct btrfs_fs_info *info = extent_root->fs_info; - struct btrfs_path *path; struct pending_extent_op *extent_op; struct btrfs_key key; int ret; @@ -2083,8 +2086,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, btrfs_fs_incompat(extent_root->fs_info, BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA); - path = btrfs_alloc_path(); - while(1) { ret = find_first_extent_bit(&info->extent_ins, 0, &start, &end, EXTENT_LOCKED); @@ -2119,7 +2120,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, GFP_NOFS); kfree(extent_op); } - btrfs_free_path(path); return 0; } diff --git a/file-item.c b/file-item.c index 9c787f0..82bf99e 100644 --- a/file-item.c +++ b/file-item.c @@ -417,6 +417,8 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans, root = root->fs_info->csum_root; path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; while (1) { key.objectid = BTRFS_EXTENT_CSUM_OBJECTID; diff --git a/root-tree.c b/root-tree.c index c6b13dc..09873a4 100644 --- a/root-tree.c +++ b/root-tree.c @@ -193,6 +193,8 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans, path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; key.objectid = root_id; key.type = type; |