]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Btrfs: Fix a trivial warning using max() of u64 vs ULL.
authorJoel Becker <joel.becker@oracle.com>
Tue, 21 Apr 2009 19:38:30 +0000 (12:38 -0700)
committerChris Mason <chris.mason@oracle.com>
Mon, 27 Apr 2009 12:37:49 +0000 (08:37 -0400)
A small warning popped up on ia64 because inode-map.c was comparing a
u64 object id with the ULL FIRST_FREE_OBJECTID.  My first thought was
that all the OBJECTID constants should contain the u64 cast because
btrfs code deals entirely in u64s.  But then I saw how large that was,
and figured I'd just fix the max() call.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/inode-map.c

index cc7334d833c9d27f4a139b6b96232e959f1458a5..9abbced1123dc67139e2de6af415c0b41cfcfda5 100644 (file)
@@ -79,7 +79,7 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
        }
        path = btrfs_alloc_path();
        BUG_ON(!path);
-       search_start = max(search_start, BTRFS_FIRST_FREE_OBJECTID);
+       search_start = max(search_start, (u64)BTRFS_FIRST_FREE_OBJECTID);
        search_key.objectid = search_start;
        search_key.type = 0;
        search_key.offset = 0;