diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-19 16:35:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-19 16:35:14 +0100 |
| commit | ca680888d5d0d03862ec311a83c6a1c7a1e00a01 (patch) | |
| tree | bc2a1777f1d715f947fa77940ebce5c43029b37b /fs/btrfs/orphan.c | |
| parent | 40dc11ffb35e8c4e8fa71092048e0f8de9db758c (diff) | |
| parent | b0c3844d8af6b9f3f18f31e1b0502fbefa2166be (diff) | |
| download | linux-ca680888d5d0d03862ec311a83c6a1c7a1e00a01.tar.bz2 | |
Merge commit 'v2.6.37-rc6' into sched/core
Merge reason: Update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/btrfs/orphan.c')
| -rw-r--r-- | fs/btrfs/orphan.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/orphan.c b/fs/btrfs/orphan.c index 79cba5fbc28e..f8be250963a0 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) { + ret = -ENOENT; + goto out; + } ret = btrfs_del_item(trans, root, path); |