Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_numbers

Conflicts:
	fs/btrfs/free-space-cache.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index a6a9d4e8b491..1d9410e39212 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -208,8 +208,9 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                                                 EXTENT_NODATASUM, GFP_NOFS);
                                 } else {
                                         printk(KERN_INFO "btrfs no csum found "
-                                               "for inode %lu start %llu\n",
-                                               inode->i_ino,
+                                               "for inode %llu start %llu\n",
+                                               (unsigned long long)
+                                               btrfs_ino(inode),
                                                (unsigned long long)offset);
                                 }
                                 item = NULL;