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

[karo-tx-linux.git] / fs / nilfs2 / direct.c

diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c
index 251a449284053c6e8683ca1597d78149d3a9854c..96e3ed0d9652b67de00717f0e9a9042b3106620d 100644 (file)
--- a/fs/nilfs2/direct.c
+++ b/fs/nilfs2/direct.c
@@ -337,14 +337,16 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap,
 
        key = nilfs_bmap_data_get_key(bmap, *bh);
        if (unlikely(key > NILFS_DIRECT_KEY_MAX)) {
-               printk(KERN_CRIT "%s: invalid key: %llu\n", __func__,
-                      (unsigned long long)key);
+               nilfs_msg(bmap->b_inode->i_sb, KERN_CRIT,
+                         "%s (ino=%lu): invalid key: %llu", __func__,
+                         bmap->b_inode->i_ino, (unsigned long long)key);
                return -EINVAL;
        }
        ptr = nilfs_direct_get_ptr(bmap, key);
        if (unlikely(ptr == NILFS_BMAP_INVALID_PTR)) {
-               printk(KERN_CRIT "%s: invalid pointer: %llu\n", __func__,
-                      (unsigned long long)ptr);
+               nilfs_msg(bmap->b_inode->i_sb, KERN_CRIT,
+                         "%s (ino=%lu): invalid pointer: %llu", __func__,
+                         bmap->b_inode->i_ino, (unsigned long long)ptr);
                return -EINVAL;
        }