Merge tag 'drm-intel-next-fixes-2016-05-25' of git://anongit.freedesktop.org/drm...

[deliverable/linux.git] / fs / nilfs2 / bmap.c

diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c
index a5eab798a7a3ef08a09e11db0e1ff6e22b9fd028..f2a7877e0c8c98a0b830d04495a9f8dcf156f79f 100644 (file)
--- a/fs/nilfs2/bmap.c
+++ b/fs/nilfs2/bmap.c
@@ -42,7 +42,7 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap,
 
        if (err == -EINVAL) {
                nilfs_error(inode->i_sb, fname,
-                           "broken bmap (inode number=%lu)\n", inode->i_ino);
+                           "broken bmap (inode number=%lu)", inode->i_ino);
                err = -EIO;
        }
        return err;
@@ -93,7 +93,7 @@ int nilfs_bmap_lookup_at_level(struct nilfs_bmap *bmap, __u64 key, int level,
 }
 
 int nilfs_bmap_lookup_contig(struct nilfs_bmap *bmap, __u64 key, __u64 *ptrp,
-                            unsigned maxblocks)
+                            unsigned int maxblocks)
 {
        int ret;