Commit d3541834 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'fix/find-item-path-leak' of... 

Merge branch 'fix/find-item-path-leak' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
parents ce93ec54 1d4c08e0

fs/btrfs/backref.c

+6 −22
Original line number Diff line number Diff line
@@ -1246,25 +1246,6 @@ int btrfs_check_shared(struct btrfs_trans_handle *trans, 
	return ret;

}



/*

 * this makes the path point to (inum INODE_ITEM ioff)

 */

int inode_item_info(u64 inum, u64 ioff, struct btrfs_root *fs_root,

			struct btrfs_path *path)

{

	struct btrfs_key key;

	return btrfs_find_item(fs_root, path, inum, ioff,

			BTRFS_INODE_ITEM_KEY, &key);

}



static int inode_ref_info(u64 inum, u64 ioff, struct btrfs_root *fs_root,

				struct btrfs_path *path,

				struct btrfs_key *found_key)

{

	return btrfs_find_item(fs_root, path, inum, ioff,

			BTRFS_INODE_REF_KEY, found_key);

}



int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid,

			  u64 start_off, struct btrfs_path *path,

			  struct btrfs_inode_extref **ret_extref,
@@ -1374,7 +1355,8 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path, 
			btrfs_tree_read_unlock_blocking(eb);

			free_extent_buffer(eb);

		}

		ret = inode_ref_info(parent, 0, fs_root, path, &found_key);

		ret = btrfs_find_item(fs_root, path, parent, 0,

				BTRFS_INODE_REF_KEY, &found_key);

		if (ret > 0)

			ret = -ENOENT;

		if (ret)
@@ -1727,8 +1709,10 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root, 
	struct btrfs_key found_key;



	while (!ret) {

		ret = inode_ref_info(inum, parent ? parent+1 : 0, fs_root, path,

		ret = btrfs_find_item(fs_root, path, inum,

				parent ? parent + 1 : 0, BTRFS_INODE_REF_KEY,

				&found_key);



		if (ret < 0)

			break;

		if (ret) {

fs/btrfs/backref.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ struct inode_fs_paths { 
typedef int (iterate_extent_inodes_t)(u64 inum, u64 offset, u64 root,

		void *ctx);



int inode_item_info(u64 inum, u64 ioff, struct btrfs_root *fs_root,

			struct btrfs_path *path);



int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,

			struct btrfs_path *path, struct btrfs_key *found_key,

			u64 *flags);

fs/btrfs/ctree.c

+5 −13
Original line number Diff line number Diff line
@@ -2617,32 +2617,24 @@ static int key_search(struct extent_buffer *b, struct btrfs_key *key, 
	return 0;

}



int btrfs_find_item(struct btrfs_root *fs_root, struct btrfs_path *found_path,

int btrfs_find_item(struct btrfs_root *fs_root, struct btrfs_path *path,

		u64 iobjectid, u64 ioff, u8 key_type,

		struct btrfs_key *found_key)

{

	int ret;

	struct btrfs_key key;

	struct extent_buffer *eb;

	struct btrfs_path *path;



	ASSERT(path);

	ASSERT(found_key);



	key.type = key_type;

	key.objectid = iobjectid;

	key.offset = ioff;



	if (found_path == NULL) {

		path = btrfs_alloc_path();

		if (!path)

			return -ENOMEM;

	} else

		path = found_path;



	ret = btrfs_search_slot(NULL, fs_root, &key, path, 0, 0);

	if ((ret < 0) || (found_key == NULL)) {

		if (path != found_path)

			btrfs_free_path(path);

	if (ret < 0)

		return ret;

	}



	eb = path->nodes[0];

	if (ret && path->slots[0] >= btrfs_header_nritems(eb)) {

fs/btrfs/disk-io.c

+13 −2
Original line number Diff line number Diff line
@@ -1630,6 +1630,8 @@ struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info, 
				     bool check_ref)

{

	struct btrfs_root *root;

	struct btrfs_path *path;

	struct btrfs_key key;

	int ret;



	if (location->objectid == BTRFS_ROOT_TREE_OBJECTID)
@@ -1669,8 +1671,17 @@ struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info, 
	if (ret)

		goto fail;



	ret = btrfs_find_item(fs_info->tree_root, NULL, BTRFS_ORPHAN_OBJECTID,

			location->objectid, BTRFS_ORPHAN_ITEM_KEY, NULL);

	path = btrfs_alloc_path();

	if (!path) {

		ret = -ENOMEM;

		goto fail;

	}

	key.objectid = BTRFS_ORPHAN_OBJECTID;

	key.type = BTRFS_ORPHAN_ITEM_KEY;

	key.offset = location->objectid;



	ret = btrfs_search_slot(NULL, fs_info->tree_root, &key, path, 0, 0);

	btrfs_free_path(path);

	if (ret < 0)

		goto fail;

	if (ret == 0)

fs/btrfs/inode.c

+7 −3
Original line number Diff line number Diff line
@@ -5009,6 +5009,7 @@ static int fixup_tree_root_location(struct btrfs_root *root, 
	struct btrfs_root *new_root;

	struct btrfs_root_ref *ref;

	struct extent_buffer *leaf;

	struct btrfs_key key;

	int ret;

	int err = 0;
@@ -5019,9 +5020,12 @@ static int fixup_tree_root_location(struct btrfs_root *root, 
	}



	err = -ENOENT;

	ret = btrfs_find_item(root->fs_info->tree_root, path,

				BTRFS_I(dir)->root->root_key.objectid,

				location->objectid, BTRFS_ROOT_REF_KEY, NULL);

	key.objectid = BTRFS_I(dir)->root->root_key.objectid;

	key.type = BTRFS_ROOT_REF_KEY;

	key.offset = location->objectid;



	ret = btrfs_search_slot(NULL, root->fs_info->tree_root, &key, path,

				0, 0);

	if (ret) {

		if (ret < 0)

			err = ret;