Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[~andy/linux] / fs / reiserfs / bitmap.c

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index 1bfae42117ca714d1951a179d26d037f12226767..b286ccb085879172a6bac6f5055c14b4c3cd363a 100644 (file)
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -708,7 +708,7 @@ static void oid_groups(reiserfs_blocknr_hint_t * hint)
  */
 static int get_left_neighbor(reiserfs_blocknr_hint_t * hint)
 {
-       struct path *path;
+       struct treepath *path;
        struct buffer_head *bh;
        struct item_head *ih;
        int pos_in_item;
@@ -1304,8 +1304,8 @@ struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb,
 
        bh = sb_bread(sb, block);
        if (bh == NULL)
-               reiserfs_warning(sb, "sh-2029: %s: bitmap block (#%lu) "
-                                "reading failed", __FUNCTION__, bh->b_blocknr);
+               reiserfs_warning(sb, "sh-2029: %s: bitmap block (#%u) "
+                                "reading failed", __FUNCTION__, block);
        else {
                if (buffer_locked(bh)) {
                        PROC_INFO_INC(sb, scan_bitmap.wait);