Merge tag 'samsung-fixes-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index 1ec8ae5..dbcf1dc 100644 (file)
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -283,9 +283,9 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
                goto out;
 
        if (!inode->i_nlink) {
-               nilfs_warning(inode->i_sb, __func__,
-                             "deleting nonexistent file (%lu), %d",
-                             inode->i_ino, inode->i_nlink);
+               nilfs_msg(inode->i_sb, KERN_WARNING,
+                         "deleting nonexistent file (ino=%lu), %d",
+                         inode->i_ino, inode->i_nlink);
                set_nlink(inode, 1);
        }
        err = nilfs_delete_entry(de, page);