]> git.openfabrics.org - ~shefty/rdma-dev.git/blobdiff - fs/jffs2/super.c
Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6
[~shefty/rdma-dev.git] / fs / jffs2 / super.c
index 5863a369d929b4e652ed93bbeab466ab72130d58..f2d96b5e64f6fa47ee8fd11543156c926779ca0e 100644 (file)
@@ -45,7 +45,6 @@ static struct inode *jffs2_alloc_inode(struct super_block *sb)
 static void jffs2_i_callback(struct rcu_head *head)
 {
        struct inode *inode = container_of(head, struct inode, i_rcu);
 static void jffs2_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(jffs2_inode_cachep, JFFS2_INODE_INFO(inode));
 }
 
        kmem_cache_free(jffs2_inode_cachep, JFFS2_INODE_INFO(inode));
 }
 
@@ -97,9 +96,9 @@ static const char *jffs2_compr_name(unsigned int compr)
        }
 }
 
        }
 }
 
-static int jffs2_show_options(struct seq_file *s, struct vfsmount *mnt)
+static int jffs2_show_options(struct seq_file *s, struct dentry *root)
 {
 {
-       struct jffs2_sb_info *c = JFFS2_SB_INFO(mnt->mnt_sb);
+       struct jffs2_sb_info *c = JFFS2_SB_INFO(root->d_sb);
        struct jffs2_mount_opts *opts = &c->mount_opts;
 
        if (opts->override_compr)
        struct jffs2_mount_opts *opts = &c->mount_opts;
 
        if (opts->override_compr)