Merge tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / fs / logfs / inode.c

diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
index 7c42c13..a422f42 100644 (file)
--- a/fs/logfs/inode.c
+++ b/fs/logfs/inode.c
@@ -144,7 +144,6 @@ struct inode *logfs_safe_iget(struct super_block *sb, ino_t ino, int *is_cached)
 static void logfs_i_callback(struct rcu_head *head)
 {
        struct inode *inode = container_of(head, struct inode, i_rcu);
-       INIT_LIST_HEAD(&inode->i_dentry);
        kmem_cache_free(logfs_inode_cache, logfs_inode(inode));
 }
 
@@ -324,7 +323,7 @@ static void logfs_set_ino_generation(struct super_block *sb,
        mutex_unlock(&super->s_journal_mutex);
 }
 
-struct inode *logfs_new_inode(struct inode *dir, int mode)
+struct inode *logfs_new_inode(struct inode *dir, umode_t mode)
 {
        struct super_block *sb = dir->i_sb;
        struct inode *inode;