Revert "LU-2600 osd-zfs: batched object accounting"

[fs/lustre-release.git] / lustre / osd-zfs / osd_handler.c

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index 1025be9..42e6e20 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -872,6 +872,14 @@ static void osd_type_stop(struct lu_device_type *t)
 {
 }
 
+int osd_fid_alloc(const struct lu_env *env, struct obd_export *exp,
+                 struct lu_fid *fid, struct md_op_data *op_data)
+{
+       struct osd_device *osd = osd_dev(exp->exp_obd->obd_lu_dev);
+
+       return seq_client_alloc_fid(env, osd->od_cl_seq, fid);
+}
+
 static struct lu_device_type_operations osd_device_type_ops = {
        .ldto_init              = osd_type_init,
        .ldto_fini              = osd_type_fini,
@@ -897,7 +905,8 @@ static struct lu_device_type osd_device_type = {
 static struct obd_ops osd_obd_device_ops = {
        .o_owner       = THIS_MODULE,
        .o_connect      = osd_obd_connect,
-       .o_disconnect   = osd_obd_disconnect
+       .o_disconnect   = osd_obd_disconnect,
+       .o_fid_alloc    = osd_fid_alloc
 };
 
 int __init osd_init(void)
@@ -912,11 +921,11 @@ int __init osd_init(void)
        if (rc)
                return rc;
 
-       rc = class_register_type(&osd_obd_device_ops, NULL, NULL,
+       rc = class_register_type(&osd_obd_device_ops, NULL, true, NULL,
 #ifndef HAVE_ONLY_PROCFS_SEQ
-                               lprocfs_osd_module_vars,
+                                lprocfs_osd_module_vars,
 #endif
-                               LUSTRE_OSD_ZFS_NAME, &osd_device_type);
+                                LUSTRE_OSD_ZFS_NAME, &osd_device_type);
        if (rc)
                lu_kmem_fini(osd_caches);
        return rc;