LU-1866 lfsck: enhance otable-based iteration

[fs/lustre-release.git] / lustre / ofd / ofd_trans.c

diff --git a/lustre/ofd/ofd_trans.c b/lustre/ofd/ofd_trans.c
index 37b2a1a..c88988f 100644 (file)
--- 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/
@@ -122,7 +122,7 @@ static int ofd_last_rcvd_update(struct ofd_thread_info *info,
        LASSERT(ofd);
        LASSERT(info->fti_exp);
 
-       if ((info->fti_exp->exp_connect_flags & OBD_CONNECT_LIGHTWEIGHT) != 0)
+       if (exp_connect_flags(info->fti_exp) & OBD_CONNECT_LIGHTWEIGHT)
                lw_client = true;
 
        fed = &info->fti_exp->exp_filter_data;
@@ -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);
 }