diff options
| author | Kelley Nielsen <kelleynnn@gmail.com> | 2013-11-04 19:37:39 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-01-28 13:19:37 -0800 |
| commit | 3f870c28990015a1fd6c67807efcdb02a75b35e1 (patch) | |
| tree | a2fae72984da0afed204b60a93df48b0de596c7f /fs/btrfs/disk-io.c | |
| parent | 75ac2dd907013b44edbdec16f8969d14811149c9 (diff) | |
| download | lwn-3f870c28990015a1fd6c67807efcdb02a75b35e1.tar.gz lwn-3f870c28990015a1fd6c67807efcdb02a75b35e1.zip | |
btrfs: expand btrfs_find_item() to include find_orphan_item functionality
This is the third step in bootstrapping the btrfs_find_item interface.
The function find_orphan_item(), in orphan.c, is similar to the two
functions already replaced by the new interface. It uses two parameters,
which are already present in the interface, and is nearly identical to
the function brought in in the previous patch.
Replace the two calls to find_orphan_item() with calls to
btrfs_find_item(), with the defined objectid and type that was used
internally by find_orphan_item(), a null path, and a null key. Add a
test for a null path to btrfs_find_item, and if it passes, allocate and
free the path. Finally, remove find_orphan_item().
Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index d84667379f01..4ecee0a009cb 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1608,7 +1608,8 @@ again: if (ret) goto fail; - ret = btrfs_find_orphan_item(fs_info->tree_root, location->objectid); + ret = btrfs_find_item(fs_info->tree_root, NULL, BTRFS_ORPHAN_OBJECTID, + location->objectid, BTRFS_ORPHAN_ITEM_KEY, NULL); if (ret < 0) goto fail; if (ret == 0) |