Merge tag 'timers-core-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / nilfs2 / ioctl.c

diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 4ba73db..07d26f6 100644 (file)
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -569,25 +569,25 @@ static int nilfs_ioctl_move_inode_block(struct inode *inode,
 
        if (unlikely(ret < 0)) {
                if (ret == -ENOENT)
-                       nilfs_msg(inode->i_sb, KERN_CRIT,
-                                 "%s: invalid virtual block address (%s): ino=%llu, cno=%llu, offset=%llu, blocknr=%llu, vblocknr=%llu",
-                                 __func__, vdesc->vd_flags ? "node" : "data",
-                                 (unsigned long long)vdesc->vd_ino,
-                                 (unsigned long long)vdesc->vd_cno,
-                                 (unsigned long long)vdesc->vd_offset,
-                                 (unsigned long long)vdesc->vd_blocknr,
-                                 (unsigned long long)vdesc->vd_vblocknr);
+                       nilfs_crit(inode->i_sb,
+                                  "%s: invalid virtual block address (%s): ino=%llu, cno=%llu, offset=%llu, blocknr=%llu, vblocknr=%llu",
+                                  __func__, vdesc->vd_flags ? "node" : "data",
+                                  (unsigned long long)vdesc->vd_ino,
+                                  (unsigned long long)vdesc->vd_cno,
+                                  (unsigned long long)vdesc->vd_offset,
+                                  (unsigned long long)vdesc->vd_blocknr,
+                                  (unsigned long long)vdesc->vd_vblocknr);
                return ret;
        }
        if (unlikely(!list_empty(&bh->b_assoc_buffers))) {
-               nilfs_msg(inode->i_sb, KERN_CRIT,
-                         "%s: conflicting %s buffer: ino=%llu, cno=%llu, offset=%llu, blocknr=%llu, vblocknr=%llu",
-                         __func__, vdesc->vd_flags ? "node" : "data",
-                         (unsigned long long)vdesc->vd_ino,
-                         (unsigned long long)vdesc->vd_cno,
-                         (unsigned long long)vdesc->vd_offset,
-                         (unsigned long long)vdesc->vd_blocknr,
-                         (unsigned long long)vdesc->vd_vblocknr);
+               nilfs_crit(inode->i_sb,
+                          "%s: conflicting %s buffer: ino=%llu, cno=%llu, offset=%llu, blocknr=%llu, vblocknr=%llu",
+                          __func__, vdesc->vd_flags ? "node" : "data",
+                          (unsigned long long)vdesc->vd_ino,
+                          (unsigned long long)vdesc->vd_cno,
+                          (unsigned long long)vdesc->vd_offset,
+                          (unsigned long long)vdesc->vd_blocknr,
+                          (unsigned long long)vdesc->vd_vblocknr);
                brelse(bh);
                return -EEXIST;
        }
@@ -837,8 +837,7 @@ int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *nilfs,
        return 0;
 
  failed:
-       nilfs_msg(nilfs->ns_sb, KERN_ERR, "error %d preparing GC: %s", ret,
-                 msg);
+       nilfs_err(nilfs->ns_sb, "error %d preparing GC: %s", ret, msg);
        return ret;
 }
 
@@ -947,7 +946,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
 
        ret = nilfs_ioctl_move_blocks(inode->i_sb, &argv[0], kbufs[0]);
        if (ret < 0) {
-               nilfs_msg(inode->i_sb, KERN_ERR,
+               nilfs_err(inode->i_sb,
                          "error %d preparing GC: cannot read source blocks",
                          ret);
        } else {