X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fofd%2Fofd_trans.c;h=3112a50a4bee3f441504a82367650692e672d408;hp=bcd8c7aa9681c1576f783e322795bf0827991d25;hb=b0f08a4e902411a8fbdb660e5b32c5821ca7159f;hpb=5bea38b1bf8136ea4b286388ce83f2660a425493

diff --git a/lustre/ofd/ofd_trans.c b/lustre/ofd/ofd_trans.c
index bcd8c7a..3112a50 100644
--- a/lustre/ofd/ofd_trans.c
+++ b/lustre/ofd/ofd_trans.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -153,10 +153,10 @@ static int ofd_last_rcvd_update(struct ofd_thread_info *info,
 	 */
 	if (info->fti_transno == 0 &&
 	    *transno_p == ofd->ofd_lut.lut_last_transno) {
-		cfs_spin_lock(&ofd->ofd_lut.lut_translock);
+		spin_lock(&ofd->ofd_lut.lut_translock);
 		ofd->ofd_lut.lut_lsd.lsd_last_transno =
 						ofd->ofd_lut.lut_last_transno;
-		cfs_spin_unlock(&ofd->ofd_lut.lut_translock);
+		spin_unlock(&ofd->ofd_lut.lut_translock);
 		tgt_server_data_write(info->fti_env, &ofd->ofd_lut, th);
 	}
 
@@ -172,12 +172,12 @@ static int ofd_last_rcvd_update(struct ofd_thread_info *info,
 		err = 0;
 		/* All operations performed by LW clients are synchronous and
 		 * we store the committed transno in the last_rcvd header */
-		cfs_spin_lock(&tg->lut_translock);
+		spin_lock(&tg->lut_translock);
 		if (info->fti_transno > tg->lut_lsd.lsd_last_transno) {
 			tg->lut_lsd.lsd_last_transno = info->fti_transno;
 			update = true;
 		}
-		cfs_spin_unlock(&tg->lut_translock);
+		spin_unlock(&tg->lut_translock);
 		if (update)
 			err = tgt_server_data_write(info->fti_env, tg, th);
 	} else {
@@ -216,7 +216,7 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
 		info->fti_has_trans = 1;
 	}
 
-	cfs_spin_lock(&ofd->ofd_lut.lut_translock);
+	spin_lock(&ofd->ofd_lut.lut_translock);
 	if (txn->th_result != 0) {
 		if (info->fti_transno != 0) {
 			CERROR("Replay transno "LPU64" failed: rc %d\n",
@@ -230,7 +230,7 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
 		if (info->fti_transno > ofd->ofd_lut.lut_last_transno)
 			ofd->ofd_lut.lut_last_transno = info->fti_transno;
 	}
-	cfs_spin_unlock(&ofd->ofd_lut.lut_translock);
+	spin_unlock(&ofd->ofd_lut.lut_translock);
 
 	/** VBR: set new versions */
 	if (txn->th_result == 0 && info->fti_obj != NULL) {
@@ -244,9 +244,9 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
 	       info->fti_transno, ofd_obd(ofd)->obd_last_committed);
 
 	/* if can't add callback, do sync write */
-	txn->th_sync = !!tgt_last_commit_cb_add(txn, &ofd->ofd_lut,
-						info->fti_exp,
-						info->fti_transno);
+	txn->th_sync |= !!tgt_last_commit_cb_add(txn, &ofd->ofd_lut,
+						 info->fti_exp,
+						 info->fti_transno);
 
 	return ofd_last_rcvd_update(info, txn);
 }