Branch HEAD

fix "the busy llcds"
b=19235
i=shadow
i=tom.wang

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 8ef247e..5151b73 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -4054,7 +4054,6 @@ int filter_destroy(struct obd_export *exp, struct obdo *oa,
                                       obd->obd_name, (int)oa->o_gr);
                                GOTO(cleanup, rc = PTR_ERR(olg));
                         }
-                        llog_group_set_export(olg, exp);
                         fcc = &oa->o_lcookie;
                         ctxt = llog_group_get_ctxt(olg, fcc->lgc_subsys + 1);
                         llog_cancel(ctxt, NULL, 1, fcc, 0);

diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index adbaf03..45163a4 100644 (file)
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -433,7 +433,7 @@ void llog_recov_thread_stop(struct llog_commit_master *lcm, int force)
                 struct list_head         *tmp;
 
                 CERROR("Busy llcds found (%d) on lcm %p\n",
-                       atomic_read(&lcm->lcm_count) == 0, lcm);
+                       atomic_read(&lcm->lcm_count), lcm);
 
                 spin_lock(&lcm->lcm_lock);
                 list_for_each(tmp, &lcm->lcm_llcds) {