diff --git a/[refs] b/[refs] index c2f02ee91686..a059d7cd7a70 100644 --- 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 index fdd423a550d6..91572091c0a4 100644 --- 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); } /*