commit f254e52c1ce550fdaa0d31f5e068f0d67c2485d4
author Chris Mason <chris.mason@oracle.com> Thu Mar 29 15:15:27 2007 -0400
committer David Woodhouse <dwmw2@hera.kernel.org> Thu Mar 29 15:15:27 2007 -0400
tree 1232b7e16b6f0b1b1b150c5df396452cac5e3853
parent 75dfe3960e602e63ea42ac7a2a0520832b189ffa

Btrfs: verify csums on read

Signed-off-by: Chris Mason <chris.mason@oracle.com>

fs/btrfs/ctree.c

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 48c6119..1eb333e 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -109,14 +109,14 @@
 		return 1;
 	if (k1.objectid < k2->objectid)
 		return -1;
-	if (k1.flags > k2->flags)
-		return 1;
-	if (k1.flags < k2->flags)
-		return -1;
 	if (k1.offset > k2->offset)
 		return 1;
 	if (k1.offset < k2->offset)
 		return -1;
+	if (k1.flags > k2->flags)
+		return 1;
+	if (k1.flags < k2->flags)
+		return -1;
 	return 0;
 }
 
@@ -1165,7 +1165,6 @@
 		BUG();
 	ret = btrfs_search_slot(trans, root, cpu_key, path, data_size, 1);
 	if (ret == 0) {
-		btrfs_release_path(root, path);
 		return -EEXIST;
 	}
 	if (ret < 0)