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

Commit c2db1073 authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by root
Browse files

Btrfs: check return value of btrfs_alloc_path() 



Adding the check on the return value of btrfs_alloc_path() to several places.
And, some of callers are modified by this change.

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

fs/btrfs/compression.c

+7 −4
Original line number Diff line number Diff line
@@ -663,8 +663,9 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
			atomic_inc(&cb->pending_bios);



			if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {

				btrfs_lookup_bio_sums(root, inode, comp_bio,

						      sums);

				ret = btrfs_lookup_bio_sums(root, inode,

							comp_bio, sums);

				BUG_ON(ret);

			}

			sums += (comp_bio->bi_size + root->sectorsize - 1) /

				root->sectorsize;
@@ -689,8 +690,10 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, 0);

	BUG_ON(ret);



	if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM))

		btrfs_lookup_bio_sums(root, inode, comp_bio, sums);

	if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {

		ret = btrfs_lookup_bio_sums(root, inode, comp_bio, sums);

		BUG_ON(ret);

	}



	ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0);

	BUG_ON(ret);

fs/btrfs/dir-item.c

+6 −4
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root 
		ret = PTR_ERR(dir_item);

		if (ret == -EEXIST)

			goto second_insert;

		goto out;

		goto out_free;

	}



	leaf = path->nodes[0];
@@ -170,7 +170,7 @@ second_insert: 
	/* FIXME, use some real flag for selecting the extra index */

	if (root == root->fs_info->tree_root) {

		ret = 0;

		goto out;

		goto out_free;

	}

	btrfs_release_path(root, path);
@@ -180,7 +180,7 @@ second_insert: 
					name, name_len);

	if (IS_ERR(dir_item)) {

		ret2 = PTR_ERR(dir_item);

		goto out;

		goto out_free;

	}

	leaf = path->nodes[0];

	btrfs_cpu_key_to_disk(&disk_key, location);
@@ -192,7 +192,9 @@ second_insert: 
	name_ptr = (unsigned long)(dir_item + 1);

	write_extent_buffer(leaf, name, name_ptr, name_len);

	btrfs_mark_buffer_dirty(leaf);

out:



out_free:



	btrfs_free_path(path);

	if (ret)

		return ret;

fs/btrfs/file-item.c

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, 
	struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;



	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;

	if (bio->bi_size > PAGE_CACHE_SIZE * 8)

		path->reada = 2;

fs/btrfs/inode.c

+12 −6
Original line number Diff line number Diff line
@@ -1467,8 +1467,11 @@ static int btrfs_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, 
		if (bio_flags & EXTENT_BIO_COMPRESSED) {

			return btrfs_submit_compressed_read(inode, bio,

						    mirror_num, bio_flags);

		} else if (!skip_sum)

			btrfs_lookup_bio_sums(root, inode, bio, NULL);

		} else if (!skip_sum) {

			ret = btrfs_lookup_bio_sums(root, inode, bio, NULL);

			if (ret)

				return ret;

		}

		goto mapit;

	} else if (!skip_sum) {

		/* csum items have already been cloned */
@@ -1903,10 +1906,10 @@ static int btrfs_io_failed_hook(struct bio *failed_bio, 
	else

		rw = READ;



	BTRFS_I(inode)->io_tree.ops->submit_bio_hook(inode, rw, bio,

	ret = BTRFS_I(inode)->io_tree.ops->submit_bio_hook(inode, rw, bio,

						      failrec->last_mirror,

						      failrec->bio_flags, 0);

	return 0;

	return ret;

}



/*
@@ -5943,9 +5946,12 @@ static inline int __btrfs_submit_dio_bio(struct bio *bio, struct inode *inode, 
				   __btrfs_submit_bio_start_direct_io,

				   __btrfs_submit_bio_done);

		goto err;

	} else if (!skip_sum)

		btrfs_lookup_bio_sums_dio(root, inode, bio,

	} else if (!skip_sum) {

		ret = btrfs_lookup_bio_sums_dio(root, inode, bio,

					  file_offset, csums);

		if (ret)

			goto err;

	}



	ret = btrfs_map_bio(root, rw, bio, 0, 1);

err: