]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - fs/exofs/super.c
convert get_sb_nodev() users
[linux-2.6.git] / fs / exofs / super.c
index 8216c5b77b5325db78970efc711ab3729a1ea46e..79c3ae6e045693ec5e7e8f91cf031309be175242 100644 (file)
@@ -1,8 +1,6 @@
 /*
  * Copyright (C) 2005, 2006
- * Avishay Traeger (avishay@gmail.com) (avishay@il.ibm.com)
- * Copyright (C) 2005, 2006
- * International Business Machines
+ * Avishay Traeger (avishay@gmail.com)
  * Copyright (C) 2008, 2009
  * Boaz Harrosh <bharrosh@panasas.com>
  *
@@ -38,6 +36,7 @@
 #include <linux/vfs.h>
 #include <linux/random.h>
 #include <linux/exportfs.h>
+#include <linux/slab.h>
 
 #include "exofs.h"
 
@@ -200,55 +199,49 @@ static const struct export_operations exofs_export_ops;
 /*
  * Write the superblock to the OSD
  */
-static int exofs_sync_fs(struct super_block *sb, int wait)
+int exofs_sync_fs(struct super_block *sb, int wait)
 {
        struct exofs_sb_info *sbi;
        struct exofs_fscb *fscb;
-       struct osd_request *or;
-       struct osd_obj_id obj;
+       struct exofs_io_state *ios;
        int ret = -ENOMEM;
 
-       fscb = kzalloc(sizeof(struct exofs_fscb), GFP_KERNEL);
-       if (!fscb) {
-               EXOFS_ERR("exofs_write_super: memory allocation failed.\n");
-               return -ENOMEM;
-       }
-
        lock_super(sb);
-       lock_kernel();
        sbi = sb->s_fs_info;
+       fscb = &sbi->s_fscb;
+
+       ret = exofs_get_io_state(&sbi->layout, &ios);
+       if (ret)
+               goto out;
+
+       /* Note: We only write the changing part of the fscb. .i.e upto the
+        *       the fscb->s_dev_table_oid member. There is no read-modify-write
+        *       here.
+        */
+       ios->length = offsetof(struct exofs_fscb, s_dev_table_oid);
+       memset(fscb, 0, ios->length);
        fscb->s_nextid = cpu_to_le64(sbi->s_nextid);
        fscb->s_numfiles = cpu_to_le32(sbi->s_numfiles);
        fscb->s_magic = cpu_to_le16(sb->s_magic);
        fscb->s_newfs = 0;
+       fscb->s_version = EXOFS_FSCB_VER;
 
-       or = osd_start_request(sbi->s_dev, GFP_KERNEL);
-       if (unlikely(!or)) {
-               EXOFS_ERR("exofs_write_super: osd_start_request failed.\n");
-               goto out;
-       }
-
-       obj.partition = sbi->s_pid;
-       obj.id = EXOFS_SUPER_ID;
-       ret = osd_req_write_kern(or, &obj, 0, fscb, sizeof(*fscb));
-       if (unlikely(ret)) {
-               EXOFS_ERR("exofs_write_super: osd_req_write_kern failed.\n");
-               goto out;
-       }
+       ios->obj.id = EXOFS_SUPER_ID;
+       ios->offset = 0;
+       ios->kern_buff = fscb;
+       ios->cred = sbi->s_cred;
 
-       ret = exofs_sync_op(or, sbi->s_timeout, sbi->s_cred);
+       ret = exofs_sbi_write(ios);
        if (unlikely(ret)) {
-               EXOFS_ERR("exofs_write_super: exofs_sync_op failed.\n");
+               EXOFS_ERR("%s: exofs_sbi_write failed.\n", __func__);
                goto out;
        }
        sb->s_dirt = 0;
 
 out:
-       if (or)
-               osd_end_request(or);
-       unlock_kernel();
+       EXOFS_DBGMSG("s_nextid=0x%llx ret=%d\n", _LLU(sbi->s_nextid), ret);
+       exofs_put_io_state(ios);
        unlock_super(sb);
-       kfree(fscb);
        return ret;
 }
 
@@ -260,6 +253,29 @@ static void exofs_write_super(struct super_block *sb)
                sb->s_dirt = 0;
 }
 
+static void _exofs_print_device(const char *msg, const char *dev_path,
+                               struct osd_dev *od, u64 pid)
+{
+       const struct osd_dev_info *odi = osduld_device_info(od);
+
+       printk(KERN_NOTICE "exofs: %s %s osd_name-%s pid-0x%llx\n",
+               msg, dev_path ?: "", odi->osdname, _LLU(pid));
+}
+
+void exofs_free_sbi(struct exofs_sb_info *sbi)
+{
+       while (sbi->layout.s_numdevs) {
+               int i = --sbi->layout.s_numdevs;
+               struct osd_dev *od = sbi->layout.s_ods[i];
+
+               if (od) {
+                       sbi->layout.s_ods[i] = NULL;
+                       osduld_put_device(od);
+               }
+       }
+       kfree(sbi);
+}
+
 /*
  * This function is called when the vfs is freeing the superblock.  We just
  * need to free our own part.
@@ -269,8 +285,6 @@ static void exofs_put_super(struct super_block *sb)
        int num_pend;
        struct exofs_sb_info *sbi = sb->s_fs_info;
 
-       lock_kernel();
-
        if (sb->s_dirt)
                exofs_write_super(sb);
 
@@ -284,11 +298,234 @@ static void exofs_put_super(struct super_block *sb)
                                  msecs_to_jiffies(100));
        }
 
-       osduld_put_device(sbi->s_dev);
-       kfree(sb->s_fs_info);
+       _exofs_print_device("Unmounting", NULL, sbi->layout.s_ods[0],
+                           sbi->layout.s_pid);
+
+       bdi_destroy(&sbi->bdi);
+       exofs_free_sbi(sbi);
        sb->s_fs_info = NULL;
+}
 
-       unlock_kernel();
+static int _read_and_match_data_map(struct exofs_sb_info *sbi, unsigned numdevs,
+                                   struct exofs_device_table *dt)
+{
+       u64 stripe_length;
+
+       sbi->data_map.odm_num_comps   =
+                               le32_to_cpu(dt->dt_data_map.cb_num_comps);
+       sbi->data_map.odm_stripe_unit =
+                               le64_to_cpu(dt->dt_data_map.cb_stripe_unit);
+       sbi->data_map.odm_group_width =
+                               le32_to_cpu(dt->dt_data_map.cb_group_width);
+       sbi->data_map.odm_group_depth =
+                               le32_to_cpu(dt->dt_data_map.cb_group_depth);
+       sbi->data_map.odm_mirror_cnt  =
+                               le32_to_cpu(dt->dt_data_map.cb_mirror_cnt);
+       sbi->data_map.odm_raid_algorithm  =
+                               le32_to_cpu(dt->dt_data_map.cb_raid_algorithm);
+
+/* FIXME: Only raid0 for now. if not so, do not mount */
+       if (sbi->data_map.odm_num_comps != numdevs) {
+               EXOFS_ERR("odm_num_comps(%u) != numdevs(%u)\n",
+                         sbi->data_map.odm_num_comps, numdevs);
+               return -EINVAL;
+       }
+       if (sbi->data_map.odm_raid_algorithm != PNFS_OSD_RAID_0) {
+               EXOFS_ERR("Only RAID_0 for now\n");
+               return -EINVAL;
+       }
+       if (0 != (numdevs % (sbi->data_map.odm_mirror_cnt + 1))) {
+               EXOFS_ERR("Data Map wrong, numdevs=%d mirrors=%d\n",
+                         numdevs, sbi->data_map.odm_mirror_cnt);
+               return -EINVAL;
+       }
+
+       if (0 != (sbi->data_map.odm_stripe_unit & ~PAGE_MASK)) {
+               EXOFS_ERR("Stripe Unit(0x%llx)"
+                         " must be Multples of PAGE_SIZE(0x%lx)\n",
+                         _LLU(sbi->data_map.odm_stripe_unit), PAGE_SIZE);
+               return -EINVAL;
+       }
+
+       sbi->layout.stripe_unit = sbi->data_map.odm_stripe_unit;
+       sbi->layout.mirrors_p1 = sbi->data_map.odm_mirror_cnt + 1;
+
+       if (sbi->data_map.odm_group_width) {
+               sbi->layout.group_width = sbi->data_map.odm_group_width;
+               sbi->layout.group_depth = sbi->data_map.odm_group_depth;
+               if (!sbi->layout.group_depth) {
+                       EXOFS_ERR("group_depth == 0 && group_width != 0\n");
+                       return -EINVAL;
+               }
+               sbi->layout.group_count = sbi->data_map.odm_num_comps /
+                                               sbi->layout.mirrors_p1 /
+                                               sbi->data_map.odm_group_width;
+       } else {
+               if (sbi->data_map.odm_group_depth) {
+                       printk(KERN_NOTICE "Warning: group_depth ignored "
+                               "group_width == 0 && group_depth == %d\n",
+                               sbi->data_map.odm_group_depth);
+                       sbi->data_map.odm_group_depth = 0;
+               }
+               sbi->layout.group_width = sbi->data_map.odm_num_comps /
+                                                       sbi->layout.mirrors_p1;
+               sbi->layout.group_depth = -1;
+               sbi->layout.group_count = 1;
+       }
+
+       stripe_length = (u64)sbi->layout.group_width * sbi->layout.stripe_unit;
+       if (stripe_length >= (1ULL << 32)) {
+               EXOFS_ERR("Total Stripe length(0x%llx)"
+                         " >= 32bit is not supported\n", _LLU(stripe_length));
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+/* @odi is valid only as long as @fscb_dev is valid */
+static int exofs_devs_2_odi(struct exofs_dt_device_info *dt_dev,
+                            struct osd_dev_info *odi)
+{
+       odi->systemid_len = le32_to_cpu(dt_dev->systemid_len);
+       memcpy(odi->systemid, dt_dev->systemid, odi->systemid_len);
+
+       odi->osdname_len = le32_to_cpu(dt_dev->osdname_len);
+       odi->osdname = dt_dev->osdname;
+
+       /* FIXME support long names. Will need a _put function */
+       if (dt_dev->long_name_offset)
+               return -EINVAL;
+
+       /* Make sure osdname is printable!
+        * mkexofs should give us space for a null-terminator else the
+        * device-table is invalid.
+        */
+       if (unlikely(odi->osdname_len >= sizeof(dt_dev->osdname)))
+               odi->osdname_len = sizeof(dt_dev->osdname) - 1;
+       dt_dev->osdname[odi->osdname_len] = 0;
+
+       /* If it's all zeros something is bad we read past end-of-obj */
+       return !(odi->systemid_len || odi->osdname_len);
+}
+
+static int exofs_read_lookup_dev_table(struct exofs_sb_info **psbi,
+                                      unsigned table_count)
+{
+       struct exofs_sb_info *sbi = *psbi;
+       struct osd_dev *fscb_od;
+       struct osd_obj_id obj = {.partition = sbi->layout.s_pid,
+                                .id = EXOFS_DEVTABLE_ID};
+       struct exofs_device_table *dt;
+       unsigned table_bytes = table_count * sizeof(dt->dt_dev_table[0]) +
+                                            sizeof(*dt);
+       unsigned numdevs, i;
+       int ret;
+
+       dt = kmalloc(table_bytes, GFP_KERNEL);
+       if (unlikely(!dt)) {
+               EXOFS_ERR("ERROR: allocating %x bytes for device table\n",
+                         table_bytes);
+               return -ENOMEM;
+       }
+
+       fscb_od = sbi->layout.s_ods[0];
+       sbi->layout.s_ods[0] = NULL;
+       sbi->layout.s_numdevs = 0;
+       ret = exofs_read_kern(fscb_od, sbi->s_cred, &obj, 0, dt, table_bytes);
+       if (unlikely(ret)) {
+               EXOFS_ERR("ERROR: reading device table\n");
+               goto out;
+       }
+
+       numdevs = le64_to_cpu(dt->dt_num_devices);
+       if (unlikely(!numdevs)) {
+               ret = -EINVAL;
+               goto out;
+       }
+       WARN_ON(table_count != numdevs);
+
+       ret = _read_and_match_data_map(sbi, numdevs, dt);
+       if (unlikely(ret))
+               goto out;
+
+       if (likely(numdevs > 1)) {
+               unsigned size = numdevs * sizeof(sbi->layout.s_ods[0]);
+
+               sbi = krealloc(sbi, sizeof(*sbi) + size, GFP_KERNEL);
+               if (unlikely(!sbi)) {
+                       ret = -ENOMEM;
+                       goto out;
+               }
+               memset(&sbi->layout.s_ods[1], 0,
+                      size - sizeof(sbi->layout.s_ods[0]));
+               *psbi = sbi;
+       }
+
+       for (i = 0; i < numdevs; i++) {
+               struct exofs_fscb fscb;
+               struct osd_dev_info odi;
+               struct osd_dev *od;
+
+               if (exofs_devs_2_odi(&dt->dt_dev_table[i], &odi)) {
+                       EXOFS_ERR("ERROR: Read all-zeros device entry\n");
+                       ret = -EINVAL;
+                       goto out;
+               }
+
+               printk(KERN_NOTICE "Add device[%d]: osd_name-%s\n",
+                      i, odi.osdname);
+
+               /* On all devices the device table is identical. The user can
+                * specify any one of the participating devices on the command
+                * line. We always keep them in device-table order.
+                */
+               if (fscb_od && osduld_device_same(fscb_od, &odi)) {
+                       sbi->layout.s_ods[i] = fscb_od;
+                       ++sbi->layout.s_numdevs;
+                       fscb_od = NULL;
+                       continue;
+               }
+
+               od = osduld_info_lookup(&odi);
+               if (unlikely(IS_ERR(od))) {
+                       ret = PTR_ERR(od);
+                       EXOFS_ERR("ERROR: device requested is not found "
+                                 "osd_name-%s =>%d\n", odi.osdname, ret);
+                       goto out;
+               }
+
+               sbi->layout.s_ods[i] = od;
+               ++sbi->layout.s_numdevs;
+
+               /* Read the fscb of the other devices to make sure the FS
+                * partition is there.
+                */
+               ret = exofs_read_kern(od, sbi->s_cred, &obj, 0, &fscb,
+                                     sizeof(fscb));
+               if (unlikely(ret)) {
+                       EXOFS_ERR("ERROR: Malformed participating device "
+                                 "error reading fscb osd_name-%s\n",
+                                 odi.osdname);
+                       goto out;
+               }
+
+               /* TODO: verify other information is correct and FS-uuid
+                *       matches. Benny what did you say about device table
+                *       generation and old devices?
+                */
+       }
+
+out:
+       kfree(dt);
+       if (unlikely(!ret && fscb_od)) {
+               EXOFS_ERR(
+                     "ERROR: Bad device-table container device not present\n");
+               osduld_put_device(fscb_od);
+               ret = -EINVAL;
+       }
+
+       return ret;
 }
 
 /*
@@ -299,25 +536,36 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
        struct inode *root;
        struct exofs_mountopt *opts = data;
        struct exofs_sb_info *sbi;      /*extended info                  */
+       struct osd_dev *od;             /* Master device                 */
        struct exofs_fscb fscb;         /*on-disk superblock info        */
-       struct osd_request *or = NULL;
        struct osd_obj_id obj;
+       unsigned table_count;
        int ret;
 
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
                return -ENOMEM;
-       sb->s_fs_info = sbi;
+
+       ret = bdi_setup_and_register(&sbi->bdi, "exofs", BDI_CAP_MAP_COPY);
+       if (ret)
+               goto free_bdi;
 
        /* use mount options to fill superblock */
-       sbi->s_dev = osduld_path_lookup(opts->dev_name);
-       if (IS_ERR(sbi->s_dev)) {
-               ret = PTR_ERR(sbi->s_dev);
-               sbi->s_dev = NULL;
+       od = osduld_path_lookup(opts->dev_name);
+       if (IS_ERR(od)) {
+               ret = PTR_ERR(od);
                goto free_sbi;
        }
 
-       sbi->s_pid = opts->pid;
+       /* Default layout in case we do not have a device-table */
+       sbi->layout.stripe_unit = PAGE_SIZE;
+       sbi->layout.mirrors_p1 = 1;
+       sbi->layout.group_width = 1;
+       sbi->layout.group_depth = -1;
+       sbi->layout.group_count = 1;
+       sbi->layout.s_ods[0] = od;
+       sbi->layout.s_numdevs = 1;
+       sbi->layout.s_pid = opts->pid;
        sbi->s_timeout = opts->timeout;
 
        /* fill in some other data by hand */
@@ -330,35 +578,13 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
        sb->s_bdev = NULL;
        sb->s_dev = 0;
 
-       /* read data from on-disk superblock object */
-       obj.partition = sbi->s_pid;
+       obj.partition = sbi->layout.s_pid;
        obj.id = EXOFS_SUPER_ID;
        exofs_make_credential(sbi->s_cred, &obj);
 
-       or = osd_start_request(sbi->s_dev, GFP_KERNEL);
-       if (unlikely(!or)) {
-               if (!silent)
-                       EXOFS_ERR(
-                              "exofs_fill_super: osd_start_request failed.\n");
-               ret = -ENOMEM;
-               goto free_sbi;
-       }
-       ret = osd_req_read_kern(or, &obj, 0, &fscb, sizeof(fscb));
-       if (unlikely(ret)) {
-               if (!silent)
-                       EXOFS_ERR(
-                              "exofs_fill_super: osd_req_read_kern failed.\n");
-               ret = -ENOMEM;
-               goto free_sbi;
-       }
-
-       ret = exofs_sync_op(or, sbi->s_timeout, sbi->s_cred);
-       if (unlikely(ret)) {
-               if (!silent)
-                       EXOFS_ERR("exofs_fill_super: exofs_sync_op failed.\n");
-               ret = -EIO;
+       ret = exofs_read_kern(od, sbi->s_cred, &obj, 0, &fscb, sizeof(fscb));
+       if (unlikely(ret))
                goto free_sbi;
-       }
 
        sb->s_magic = le16_to_cpu(fscb.s_magic);
        sbi->s_nextid = le64_to_cpu(fscb.s_nextid);
@@ -371,12 +597,27 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
                ret = -EINVAL;
                goto free_sbi;
        }
+       if (le32_to_cpu(fscb.s_version) != EXOFS_FSCB_VER) {
+               EXOFS_ERR("ERROR: Bad FSCB version expected-%d got-%d\n",
+                         EXOFS_FSCB_VER, le32_to_cpu(fscb.s_version));
+               ret = -EINVAL;
+               goto free_sbi;
+       }
 
        /* start generation numbers from a random point */
        get_random_bytes(&sbi->s_next_generation, sizeof(u32));
        spin_lock_init(&sbi->s_next_gen_lock);
 
+       table_count = le64_to_cpu(fscb.s_dev_table_count);
+       if (table_count) {
+               ret = exofs_read_lookup_dev_table(&sbi, table_count);
+               if (unlikely(ret))
+                       goto free_sbi;
+       }
+
        /* set up operation vectors */
+       sb->s_bdi = &sbi->bdi;
+       sb->s_fs_info = sbi;
        sb->s_op = &exofs_sops;
        sb->s_export_op = &exofs_export_ops;
        root = exofs_iget(sb, EXOFS_ROOT_ID - EXOFS_OBJ_OFF);
@@ -402,34 +643,35 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
                goto free_sbi;
        }
 
-       ret = 0;
-out:
-       if (or)
-               osd_end_request(or);
-       return ret;
+       _exofs_print_device("Mounting", opts->dev_name, sbi->layout.s_ods[0],
+                           sbi->layout.s_pid);
+       return 0;
 
 free_sbi:
-       osduld_put_device(sbi->s_dev); /* NULL safe */
-       kfree(sbi);
-       goto out;
+       bdi_destroy(&sbi->bdi);
+free_bdi:
+       EXOFS_ERR("Unable to mount exofs on %s pid=0x%llx err=%d\n",
+                 opts->dev_name, sbi->layout.s_pid, ret);
+       exofs_free_sbi(sbi);
+       return ret;
 }
 
 /*
  * Set up the superblock (calls exofs_fill_super eventually)
  */
-static int exofs_get_sb(struct file_system_type *type,
+static struct dentry *exofs_mount(struct file_system_type *type,
                          int flags, const char *dev_name,
-                         void *data, struct vfsmount *mnt)
+                         void *data)
 {
        struct exofs_mountopt opts;
        int ret;
 
        ret = parse_options(data, &opts);
        if (ret)
-               return ret;
+               return ERR_PTR(ret);
 
        opts.dev_name = dev_name;
-       return get_sb_nodev(type, flags, &opts, exofs_fill_super, mnt);
+       return mount_nodev(type, flags, &opts, exofs_fill_super);
 }
 
 /*
@@ -440,7 +682,7 @@ static int exofs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
        struct super_block *sb = dentry->d_sb;
        struct exofs_sb_info *sbi = sb->s_fs_info;
-       struct osd_obj_id obj = {sbi->s_pid, 0};
+       struct exofs_io_state *ios;
        struct osd_attr attrs[] = {
                ATTR_DEF(OSD_APAGE_PARTITION_QUOTAS,
                        OSD_ATTR_PQ_CAPACITY_QUOTA, sizeof(__be64)),
@@ -449,32 +691,33 @@ static int exofs_statfs(struct dentry *dentry, struct kstatfs *buf)
        };
        uint64_t capacity = ULLONG_MAX;
        uint64_t used = ULLONG_MAX;
-       struct osd_request *or;
        uint8_t cred_a[OSD_CAP_LEN];
        int ret;
 
-       /* get used/capacity attributes */
-       exofs_make_credential(cred_a, &obj);
-
-       or = osd_start_request(sbi->s_dev, GFP_KERNEL);
-       if (unlikely(!or)) {
-               EXOFS_DBGMSG("exofs_statfs: osd_start_request failed.\n");
-               return -ENOMEM;
+       ret = exofs_get_io_state(&sbi->layout, &ios);
+       if (ret) {
+               EXOFS_DBGMSG("exofs_get_io_state failed.\n");
+               return ret;
        }
 
-       osd_req_get_attributes(or, &obj);
-       osd_req_add_get_attr_list(or, attrs, ARRAY_SIZE(attrs));
-       ret = exofs_sync_op(or, sbi->s_timeout, cred_a);
+       exofs_make_credential(cred_a, &ios->obj);
+       ios->cred = sbi->s_cred;
+       ios->in_attr = attrs;
+       ios->in_attr_len = ARRAY_SIZE(attrs);
+
+       ret = exofs_sbi_read(ios);
        if (unlikely(ret))
                goto out;
 
-       ret = extract_attr_from_req(or, &attrs[0]);
-       if (likely(!ret))
+       ret = extract_attr_from_ios(ios, &attrs[0]);
+       if (likely(!ret)) {
                capacity = get_unaligned_be64(attrs[0].val_ptr);
-       else
+               if (unlikely(!capacity))
+                       capacity = ULLONG_MAX;
+       } else
                EXOFS_DBGMSG("exofs_statfs: get capacity failed.\n");
 
-       ret = extract_attr_from_req(or, &attrs[1]);
+       ret = extract_attr_from_ios(ios, &attrs[1]);
        if (likely(!ret))
                used = get_unaligned_be64(attrs[1].val_ptr);
        else
@@ -483,15 +726,15 @@ static int exofs_statfs(struct dentry *dentry, struct kstatfs *buf)
        /* fill in the stats buffer */
        buf->f_type = EXOFS_SUPER_MAGIC;
        buf->f_bsize = EXOFS_BLKSIZE;
-       buf->f_blocks = (capacity >> EXOFS_BLKSHIFT);
-       buf->f_bfree = ((capacity - used) >> EXOFS_BLKSHIFT);
+       buf->f_blocks = capacity >> 9;
+       buf->f_bfree = (capacity - used) >> 9;
        buf->f_bavail = buf->f_bfree;
        buf->f_files = sbi->s_numfiles;
        buf->f_ffree = EXOFS_MAX_ID - sbi->s_numfiles;
        buf->f_namelen = EXOFS_NAME_LEN;
 
 out:
-       osd_end_request(or);
+       exofs_put_io_state(ios);
        return ret;
 }
 
@@ -499,7 +742,7 @@ static const struct super_operations exofs_sops = {
        .alloc_inode    = exofs_alloc_inode,
        .destroy_inode  = exofs_destroy_inode,
        .write_inode    = exofs_write_inode,
-       .delete_inode   = exofs_delete_inode,
+       .evict_inode    = exofs_evict_inode,
        .put_super      = exofs_put_super,
        .write_super    = exofs_write_super,
        .sync_fs        = exofs_sync_fs,
@@ -566,7 +809,7 @@ static const struct export_operations exofs_export_ops = {
 static struct file_system_type exofs_type = {
        .owner          = THIS_MODULE,
        .name           = "exofs",
-       .get_sb         = exofs_get_sb,
+       .mount          = exofs_mount,
        .kill_sb        = generic_shutdown_super,
 };