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

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index c107ff0..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) 2011, 2012 Whamcloud, Inc.
+ * 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[] = {
 	{
@@ -299,7 +297,7 @@ static struct thandle *osd_trans_create(const struct lu_env *env,
 	oh->ot_tx = tx;
 	CFS_INIT_LIST_HEAD(&oh->ot_dcb_list);
 	CFS_INIT_LIST_HEAD(&oh->ot_sa_list);
-	cfs_sema_init(&oh->ot_sa_lock, 1);
+	sema_init(&oh->ot_sa_lock, 1);
 	memset(&oh->ot_quota_trans, 0, sizeof(oh->ot_quota_trans));
 	th = &oh->ot_super;
 	th->th_dev = dt;
@@ -319,7 +317,7 @@ int osd_statfs(const struct lu_env *env, struct dt_device *d,
 	ENTRY;
 
 	rc = udmu_objset_statfs(&osd->od_objset, osfs);
-	if (rc)
+	if (unlikely(rc))
 		RETURN(rc);
 	osfs->os_bavail -= min_t(obd_size,
 				 OSD_GRANT_FOR_LOCAL_OIDS / osfs->os_bsize,
@@ -383,6 +381,7 @@ static int osd_commit_async(const struct lu_env *env, struct dt_device *dev)
 	tx_state_t	  *tx = &dmu_objset_pool(osd->od_objset.os)->dp_tx;
 	uint64_t	   txg;
 
+	mutex_enter(&tx->tx_sync_lock);
 	txg = tx->tx_open_txg + 1;
 	if (tx->tx_quiesce_txg_waiting < txg) {
 		tx->tx_quiesce_txg_waiting = txg;
@@ -568,6 +567,10 @@ static int osd_mount(const struct lu_env *env,
 	if (rc)
 		GOTO(err, rc);
 
+	rc = osd_convert_root_to_new_seq(env, o);
+	if (rc)
+		GOTO(err, rc);
+
 	/* Use our own ZAP for inode accounting by default, this can be changed
 	 * via procfs to estimate the inode usage from the block usage */
 	o->od_quota_iused_est = 0;
@@ -695,6 +698,7 @@ static struct lu_device *osd_device_fini(const struct lu_env *env,
 	ENTRY;
 
 
+	osd_shutdown(env, o);
 	osd_oi_fini(env, o);
 
 	if (o->od_objset.os) {
@@ -787,9 +791,9 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp,
 
 	*exp = class_conn2export(&conn);
 
-	cfs_spin_lock(&osd->od_objset.lock);
+	spin_lock(&osd->od_objset.lock);
 	osd->od_connects++;
-	cfs_spin_unlock(&osd->od_objset.lock);
+	spin_unlock(&osd->od_objset.lock);
 
 	RETURN(0);
 }
@@ -806,11 +810,11 @@ static int osd_obd_disconnect(struct obd_export *exp)
 	ENTRY;
 
 	/* Only disconnect the underlying layers on the final disconnect. */
-	cfs_spin_lock(&osd->od_objset.lock);
+	spin_lock(&osd->od_objset.lock);
 	osd->od_connects--;
 	if (osd->od_connects == 0)
 		release = 1;
-	cfs_spin_unlock(&osd->od_objset.lock);
+	spin_unlock(&osd->od_objset.lock);
 
 	rc = class_disconnect(exp); /* bz 9811 */
 
@@ -826,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);