vserver 1.9.3

[linux-2.6.git] / fs / ext3 / ialloc.c

diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index f30a4f4..591eed0 100644 (file)
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -65,8 +65,8 @@ read_inode_bitmap(struct super_block * sb, unsigned long block_group)
        if (!bh)
                ext3_error(sb, "read_inode_bitmap",
                            "Cannot read inode bitmap - "
-                           "block_group = %lu, inode_bitmap = %lu",
-                           block_group, (unsigned long) desc->bg_inode_bitmap);
+                           "block_group = %lu, inode_bitmap = %u",
+                           block_group, le32_to_cpu(desc->bg_inode_bitmap));
 error_out:
        return bh;
 }
@@ -98,7 +98,7 @@ void ext3_free_inode (handle_t *handle, struct inode * inode)
        unsigned long bit;
        struct ext3_group_desc * gdp;
        struct ext3_super_block * es;
-       struct ext3_sb_info *sbi = EXT3_SB(sb);
+       struct ext3_sb_info *sbi;
        int fatal = 0, err;
 
        if (atomic_read(&inode->i_count) > 1) {
@@ -115,6 +115,7 @@ void ext3_free_inode (handle_t *handle, struct inode * inode)
                printk("ext3_free_inode: inode on nonexistent device\n");
                return;
        }
+       sbi = EXT3_SB(sb);
 
        ino = inode->i_ino;
        ext3_debug ("freeing inode %lu\n", ino);