LU-64 define LOV default layout as FID_SEQ value

[fs/lustre-release.git] / lustre / obdfilter / filter_log.c

diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c
index 1f5d4fb..7ae5f88 100644 (file)
--- a/lustre/obdfilter/filter_log.c
+++ b/lustre/obdfilter/filter_log.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -178,7 +178,7 @@ static int filter_recov_log_unlink_cb(struct llog_ctxt *ctxt,
         /* This check is only valid before FID-on-OST and it should
          * be removed after FID-on-OST is implemented */
         if (oa->o_seq > FID_SEQ_OST_MAX) {
-                CERROR("%s: invalid group number "LPU64" > MAX_CMD_GROUP %d\n",
+                CERROR("%s: invalid group number "LPU64" > MAX_CMD_GROUP %u\n",
                         exp->exp_obd->obd_name, oa->o_seq, FID_SEQ_OST_MAX);
                 RETURN(-EINVAL);
         }
@@ -267,9 +267,9 @@ int filter_recov_log_mds_ost_cb(struct llog_handle *llh,
                 RETURN(LLOG_PROC_BREAK);
 
         if (rec == NULL) {
-                cfs_spin_lock_bh(&ctxt->loc_obd->obd_processing_task_lock);
+                cfs_spin_lock(&ctxt->loc_obd->u.filter.fo_flags_lock);
                 ctxt->loc_obd->u.filter.fo_mds_ost_sync = 0;
-                cfs_spin_unlock_bh(&ctxt->loc_obd->obd_processing_task_lock);
+                cfs_spin_unlock(&ctxt->loc_obd->u.filter.fo_flags_lock);
                 RETURN(0);
         }