diff options
Diffstat (limited to 'fs/btrfs/orphan.c')
| -rw-r--r-- | fs/btrfs/orphan.c | 26 | 
1 files changed, 5 insertions, 21 deletions
diff --git a/fs/btrfs/orphan.c b/fs/btrfs/orphan.c index 79cba5fbc28..65793edb38c 100644 --- a/fs/btrfs/orphan.c +++ b/fs/btrfs/orphan.c @@ -56,8 +56,12 @@ int btrfs_del_orphan_item(struct btrfs_trans_handle *trans,  		return -ENOMEM;  	ret = btrfs_search_slot(trans, root, &key, path, -1, 1); -	if (ret) +	if (ret < 0)  		goto out; +	if (ret) { /* JDM: Really? */ +		ret = -ENOENT; +		goto out; +	}  	ret = btrfs_del_item(trans, root, path); @@ -65,23 +69,3 @@ out:  	btrfs_free_path(path);  	return ret;  } - -int btrfs_find_orphan_item(struct btrfs_root *root, u64 offset) -{ -	struct btrfs_path *path; -	struct btrfs_key key; -	int ret; - -	key.objectid = BTRFS_ORPHAN_OBJECTID; -	key.type = BTRFS_ORPHAN_ITEM_KEY; -	key.offset = offset; - -	path = btrfs_alloc_path(); -	if (!path) -		return -ENOMEM; - -	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); - -	btrfs_free_path(path); -	return ret; -}  | 
