[ARM] 4478/1: AT91: Convert AT91RM9200 to use atmel_spi driver

[linux-2.6-omap-h63xx.git] / fs / efs / super.c

diff --git a/fs/efs/super.c b/fs/efs/super.c
index dfebf21289f4904a7ae784e1ab4c57ce97bafd6e..ce4acb8ff819a70b4f76733bd804c7d72e0beb2b 100644 (file)
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -11,6 +11,7 @@
 #include <linux/efs_fs.h>
 #include <linux/efs_vh.h>
 #include <linux/efs_fs_sb.h>
+#include <linux/exportfs.h>
 #include <linux/slab.h>
 #include <linux/buffer_head.h>
 #include <linux/vfs.h>
@@ -72,17 +73,15 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 {
        struct efs_inode_info *ei = (struct efs_inode_info *) foo;
 
-       if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-           SLAB_CTOR_CONSTRUCTOR)
-               inode_init_once(&ei->vfs_inode);
+       inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
        efs_inode_cachep = kmem_cache_create("efs_inode_cache",
                                sizeof(struct efs_inode_info),
                                0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-                               init_once, NULL);
+                               init_once);
        if (efs_inode_cachep == NULL)
                return -ENOMEM;
        return 0;
@@ -105,7 +104,7 @@ static int efs_remount(struct super_block *sb, int *flags, char *data)
        return 0;
 }
 
-static struct super_operations efs_superblock_operations = {
+static const struct super_operations efs_superblock_operations = {
        .alloc_inode    = efs_alloc_inode,
        .destroy_inode  = efs_destroy_inode,
        .read_inode     = efs_read_inode,
@@ -115,6 +114,7 @@ static struct super_operations efs_superblock_operations = {
 };
 
 static struct export_operations efs_export_ops = {
+       .get_dentry     = efs_get_dentry,
        .get_parent     = efs_get_parent,
 };