merge b_devel to b_eq: 20030728

(2) cobd conf doc include

diff --git a/lustre/include/linux/lustre_commit_confd.h b/lustre/include/linux/lustre_commit_confd.h
index 5a021a8..980e6ce 100644 (file)
--- a/lustre/include/linux/lustre_commit_confd.h
+++ b/lustre/include/linux/lustre_commit_confd.h
@@ -40,7 +40,7 @@ struct llog_commit_master {
         struct list_head        lcm_thread_idle;  /* list of idle daemons */
         spinlock_t              lcm_thread_lock;  /* protects thread_list */
         atomic_t                lcm_thread_numidle;/* number of idle threads */
-        int                     lcm_thread_total; /* total number of threads */
+        atomic_t                lcm_thread_total; /* total number of threads */
         int                     lcm_thread_max;   /* <= num_osts normally */
 
         int                     lcm_flags;