diff options
| author | David Sterba | 2015-01-02 19:36:14 +0100 |
|---|---|---|
| committer | David Sterba | 2015-01-14 19:23:48 +0100 |
| commit | 1d4c08e0a60be356134d0c466744d0d4e16ebab0 (patch) | |
| tree | 99e3394eaf7542f187b1d70f7ec6d89b7d28fe1f /fs/btrfs/inode.c | |
| parent | btrfs: simplify insert_orphan_item (diff) | |
| download | kernel-qcow2-linux-1d4c08e0a60be356134d0c466744d0d4e16ebab0.tar.gz kernel-qcow2-linux-1d4c08e0a60be356134d0c466744d0d4e16ebab0.tar.xz kernel-qcow2-linux-1d4c08e0a60be356134d0c466744d0d4e16ebab0.zip | |
btrfs: expand btrfs_find_item if found_key is NULL
If the found_key is NULL, then btrfs_find_item becomes a verbose wrapper
for simple btrfs_search_slot.
After we've removed all such callers, passing a NULL key is not valid
anymore.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8bf326affb94..370f23416080 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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; |