---

yaml --- r: 155919 b: refs/heads/master c: 20736ab h: refs/heads/master i: 155917: bf57f8f 155915: acc0eb7 155911: 9540b93 155903: e1d4567 v: v3
git-mirror · Jul 24, 2009 · e7be221 · e7be221
1 parent 967015f
commit e7be221
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 817d52f8dba26d0295c26035531c30ce5f1e3c3e
+refs/heads/master: 20736abaa361bea488df6a1f66f6b37fb01107b9
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
@@ -557,19 +557,7 @@ static int comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
 
 	btrfs_disk_key_to_cpu(&k1, disk);
 
-	if (k1.objectid > k2->objectid)
-		return 1;
-	if (k1.objectid < k2->objectid)
-		return -1;
-	if (k1.type > k2->type)
-		return 1;
-	if (k1.type < k2->type)
-		return -1;
-	if (k1.offset > k2->offset)
-		return 1;
-	if (k1.offset < k2->offset)
-		return -1;
-	return 0;
+	return btrfs_comp_cpu_keys(&k1, k2);
 }
 
 /*