diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-22 11:53:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-22 11:53:23 +0100 |
| commit | 6c529a266bdc590a870ee2d2092ff6527eff427b (patch) | |
| tree | 7be65fa2578820a1258b5a1e8e063a509a5d6176 /fs/btrfs/orphan.c | |
| parent | 7639dae0ca11038286bbbcda05f2bef601c1eb8d (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into perf/core
Merge reason: Pick up 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 79cba5fbc28..f8be250963a 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); |