Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[firefly-linux-kernel-4.4.55.git] / fs / jfs / super.c

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index a44eff076c171a4d11b9c6029138e6f272c8ee00..682bca642f3879799b09719f0ad1f7b319c72fe1 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -119,7 +119,6 @@ static void jfs_i_callback(struct rcu_head *head)
 {
        struct inode *inode = container_of(head, struct inode, i_rcu);
        struct jfs_inode_info *ji = JFS_IP(inode);
-       INIT_LIST_HEAD(&inode->i_dentry);
        kmem_cache_free(jfs_inode_cachep, ji);
 }
 
@@ -609,9 +608,9 @@ static int jfs_sync_fs(struct super_block *sb, int wait)
        return 0;
 }
 
-static int jfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
+static int jfs_show_options(struct seq_file *seq, struct dentry *root)
 {
-       struct jfs_sb_info *sbi = JFS_SBI(vfs->mnt_sb);
+       struct jfs_sb_info *sbi = JFS_SBI(root->d_sb);
 
        if (sbi->uid != -1)
                seq_printf(seq, ",uid=%d", sbi->uid);