X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_handler.c;h=9944e78403e3c29b53aaf142a3891ac8d7ed854f;hb=11db1a551172f596d1d284e8496530f9ce24ac81;hp=6ae9225ee2e8bd01ff1b6e18076b2d0491a54105;hpb=691fffacfd3b9e9020c615281b409b34eef2dd90;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index 6ae9225..9944e78 100644
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  *
  */
@@ -44,9 +44,6 @@
  * Author: Johann Lombardi <johann@whamcloud.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_OSD
 
 #include <lustre_ver.h>
@@ -57,6 +54,7 @@
 #include <obd_class.h>
 #include <lustre_disk.h>
 #include <lustre_fid.h>
+#include <md_object.h>
 
 #include "osd_internal.h"
 
@@ -78,7 +76,7 @@ struct lu_context_key	osd_key;
 static char *root_tag = "osd_mount, rootdb";
 
 /* Slab for OSD object allocation */
-cfs_mem_cache_t *osd_object_kmem;
+struct kmem_cache *osd_object_kmem;
 
 static struct lu_kmem_descr osd_caches[] = {
 	{
@@ -832,15 +830,6 @@ static int osd_prepare(const struct lu_env *env, struct lu_device *pdev,
 	int			 rc = 0;
 	ENTRY;
 
-	if (dev->ld_site && lu_device_is_md(dev->ld_site->ls_top_dev)) {
-		/* MDT/MDD still use old infrastructure to create
-		 * special files */
-		rc = llo_local_objects_setup(env, lu2md_dev(pdev),
-					     lu2dt_dev(dev));
-		if (rc)
-			RETURN(rc);
-	}
-
 	if (osd->od_quota_slave != NULL)
 		/* set up quota slave objects */
 		rc = qsd_prepare(env, osd->od_quota_slave);