- fixed few EXIT/RETURN

- added more debug for cacthing diff >= 0 assert

diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c
index c1e4801..4f4298c 100644 (file)
--- a/lustre/mds/mds_lov.c
+++ b/lustre/mds/mds_lov.c
@@ -504,9 +504,10 @@ static int __mds_lov_syncronize(void *data)
                 GOTO(out, rc);
         }
 
+        EXIT;
 out:
         class_decref(obd);
-        RETURN(rc);
+        return rc;
 }
 
 int mds_lov_synchronize(void *data)

diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index 89bb1b6..a08ae20 100644 (file)
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -258,11 +258,11 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                 spin_lock(&oscc->oscc_lock);
                 if (oscc->oscc_flags & OSCC_FLAG_SYNC_IN_PROGRESS) {
                         spin_unlock(&oscc->oscc_lock);
-                        return -EBUSY;
+                        RETURN(-EBUSY);
                 }
                 if (!(oscc->oscc_flags & OSCC_FLAG_RECOVERING)) {
                         spin_unlock(&oscc->oscc_lock);
-                        return 0;
+                        RETURN(0);
                 }
                 oscc->oscc_flags |= OSCC_FLAG_SYNC_IN_PROGRESS;
                 spin_unlock(&oscc->oscc_lock);
@@ -285,8 +285,9 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                                 oscc->oscc_flags |= OSCC_FLAG_NOSPC;
                         oscc->oscc_flags &= ~OSCC_FLAG_RECOVERING;
                         oscc->oscc_last_id = oa->o_id;
-                        CDEBUG(D_HA, "%s: oscc recovery finished: %d\n",
-                               oscc->oscc_obd->obd_name, rc);
+                        CDEBUG(D_HA, "%s: oscc recovery finished, last_id: "
+                               LPU64", rc: %d\n", oscc->oscc_obd->obd_name,
+                               oscc->oscc_last_id, rc);
                         wake_up(&oscc->oscc_waitq);
                 } else {
                         CDEBUG(D_ERROR, "%s: oscc recovery failed: %d\n",
@@ -340,6 +341,9 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                         *ea = lsm;
                         oscc->oscc_next_id++;
                         try_again = 0;
+
+                        CDEBUG(D_HA, "%s: set oscc_next_id = "LPU64"\n",
+                               exp->exp_obd->obd_name, oscc->oscc_next_id);
                 } else if (oscc->oscc_flags & OSCC_FLAG_NOSPC) {
                         rc = -ENOSPC;
                         spin_unlock(&oscc->oscc_lock);