X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_handler.c;h=f41a9ddedc279f435b18176c6d3ad0fde985ec19;hb=63e8a4f33dc85d2957a035fc7d4b040de35c08ce;hp=35bbed0dd568abfbd39d48ff28fe921cdac1ed12;hpb=c50a9e2ae39df781598696dae4f33d60199a84dd;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index 35bbed0..f41a9dd 100644
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -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>
@@ -79,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[] = {
 	{
@@ -532,6 +529,9 @@ static int osd_mount(const struct lu_env *env,
 	strncpy(o->od_svname, lustre_cfg_string(cfg, 4),
 		sizeof(o->od_svname) - 1);
 
+	if (server_name_is_ost(o->od_svname))
+		o->od_is_ost = 1;
+
 	rc = -udmu_objset_open(o->od_mntdev, &o->od_objset);
 	if (rc) {
 		CERROR("can't open objset %s: %d\n", o->od_mntdev, rc);