summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2009-04-21 12:38:30 -0700
committerChris Mason <chris.mason@oracle.com>2009-04-27 08:37:49 -0400
commite63b6a6c0ffa2ebd8617cc1a10969000296831aa (patch)
treebb8a5b4ad968c161c327e592e0302308e21573bb /fs
parent45c06543afe2772c02f21efee0e2138b4e1c911e (diff)
downloadop-kernel-dev-e63b6a6c0ffa2ebd8617cc1a10969000296831aa.zip
op-kernel-dev-e63b6a6c0ffa2ebd8617cc1a10969000296831aa.tar.gz
Btrfs: Fix a trivial warning using max() of u64 vs ULL.
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/inode-map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index cc7334d..9abbced 100644
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -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;
OpenPOWER on IntegriCloud