diff options
Diffstat (limited to 'fs/jffs2/dir.c')
-rw-r--r-- | fs/jffs2/dir.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index 01a07af0021d..a7a3c1ac9121 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c | |||
@@ -103,7 +103,7 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target, | |||
103 | if (ino) { | 103 | if (ino) { |
104 | inode = jffs2_iget(dir_i->i_sb, ino); | 104 | inode = jffs2_iget(dir_i->i_sb, ino); |
105 | if (IS_ERR(inode)) | 105 | if (IS_ERR(inode)) |
106 | printk(KERN_WARNING "iget() failed for ino #%u\n", ino); | 106 | pr_warn("iget() failed for ino #%u\n", ino); |
107 | } | 107 | } |
108 | 108 | ||
109 | return d_splice_alias(inode, target); | 109 | return d_splice_alias(inode, target); |
@@ -365,7 +365,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char | |||
365 | /* We use f->target field to store the target path. */ | 365 | /* We use f->target field to store the target path. */ |
366 | f->target = kmemdup(target, targetlen + 1, GFP_KERNEL); | 366 | f->target = kmemdup(target, targetlen + 1, GFP_KERNEL); |
367 | if (!f->target) { | 367 | if (!f->target) { |
368 | printk(KERN_WARNING "Can't allocate %d bytes of memory\n", targetlen + 1); | 368 | pr_warn("Can't allocate %d bytes of memory\n", targetlen + 1); |
369 | mutex_unlock(&f->sem); | 369 | mutex_unlock(&f->sem); |
370 | jffs2_complete_reservation(c); | 370 | jffs2_complete_reservation(c); |
371 | ret = -ENOMEM; | 371 | ret = -ENOMEM; |
@@ -860,7 +860,8 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry, | |||
860 | f->inocache->pino_nlink++; | 860 | f->inocache->pino_nlink++; |
861 | mutex_unlock(&f->sem); | 861 | mutex_unlock(&f->sem); |
862 | 862 | ||
863 | printk(KERN_NOTICE "jffs2_rename(): Link succeeded, unlink failed (err %d). You now have a hard link\n", ret); | 863 | pr_notice("%s(): Link succeeded, unlink failed (err %d). You now have a hard link\n", |
864 | __func__, ret); | ||
864 | /* Might as well let the VFS know */ | 865 | /* Might as well let the VFS know */ |
865 | d_instantiate(new_dentry, old_dentry->d_inode); | 866 | d_instantiate(new_dentry, old_dentry->d_inode); |
866 | ihold(old_dentry->d_inode); | 867 | ihold(old_dentry->d_inode); |