Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / fs / nilfs2 / ifile.c

diff --git a/fs/nilfs2/ifile.c b/fs/nilfs2/ifile.c
index 1d2b180..b8fa45c 100644 (file)
--- a/fs/nilfs2/ifile.c
+++ b/fs/nilfs2/ifile.c
@@ -145,15 +145,14 @@ int nilfs_ifile_get_inode_block(struct inode *ifile, ino_t ino,
        int err;
 
        if (unlikely(!NILFS_VALID_INODE(sb, ino))) {
-               nilfs_error(sb, __func__, "bad inode number: %lu",
-                           (unsigned long) ino);
+               nilfs_error(sb, "bad inode number: %lu", (unsigned long)ino);
                return -EINVAL;
        }
 
        err = nilfs_palloc_get_entry_block(ifile, ino, 0, out_bh);
        if (unlikely(err))
-               nilfs_warning(sb, __func__, "unable to read inode: %lu",
-                             (unsigned long) ino);
+               nilfs_msg(sb, KERN_WARNING, "error %d reading inode: ino=%lu",
+                         err, (unsigned long)ino);
        return err;
 }