Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index 8234af99d7d748480e3cc07d794686b4b6a9b6a7..1ec8ae5995a59c94d4dd5b6f1f41054b461b7c59 100644 (file)
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -44,6 +44,7 @@
 static inline int nilfs_add_nondir(struct dentry *dentry, struct inode *inode)
 {
        int err = nilfs_add_link(dentry, inode);
+
        if (!err) {
                d_instantiate(dentry, inode);
                unlock_new_inode(inode);
@@ -138,7 +139,7 @@ static int nilfs_symlink(struct inode *dir, struct dentry *dentry,
 {
        struct nilfs_transaction_info ti;
        struct super_block *sb = dir->i_sb;
-       unsigned l = strlen(symname)+1;
+       unsigned int l = strlen(symname) + 1;
        struct inode *inode;
        int err;
 
@@ -283,7 +284,7 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
 
        if (!inode->i_nlink) {
                nilfs_warning(inode->i_sb, __func__,
-                             "deleting nonexistent file (%lu), %d\n",
+                             "deleting nonexistent file (%lu), %d",
                              inode->i_ino, inode->i_nlink);
                set_nlink(inode, 1);
        }