Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[mv-sheeva.git] / fs / btrfs / inode-map.c

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 2aa79873eb46a46baa00503d6682de1861db7c45..9abbced1123dc67139e2de6af415c0b41cfcfda5 100644 (file)
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -79,12 +79,11 @@ 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;
 
-       btrfs_init_path(path);
        start_found = 0;
        ret = btrfs_search_slot(trans, root, &search_key, path, 0, 0);
        if (ret < 0)