Merge branch 'stable/for-linus-3.6' into linux-next

[~andy/linux] / fs / btrfs / orphan.c

diff --git a/fs/btrfs/orphan.c b/fs/btrfs/orphan.c
index f8be250963a09a283b8ec4ab04bcb1c3a962427e..24cad1695af74790ecc18182db35a0ed5c8cce7a 100644 (file)
--- a/fs/btrfs/orphan.c
+++ b/fs/btrfs/orphan.c
@@ -58,7 +58,7 @@ int btrfs_del_orphan_item(struct btrfs_trans_handle *trans,
        ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
        if (ret < 0)
                goto out;
-       if (ret) {
+       if (ret) { /* JDM: Really? */
                ret = -ENOENT;
                goto out;
        }