From: tianzy <tianzy>
Date: Thu, 11 Sep 2008 14:51:22 +0000 (+0000)
Subject: Branch b1_8_gate
X-Git-Tag: v1_7_100~1^470
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2461fa12d1b1bec3145fbf0f4c6b1a6d02f9695b;p=fs%2Flustre-release.git

Branch b1_8_gate
This patch includes att18982, att18236, att18237,att18983 and att19061 in bz14840.
Slove "quota recovery deadlock during mds failover", it includes:
1. fix osts hang when mds does failover with quotaon
2. prevent watchdog storm when osts threads wait for the
   recovery of mds
b=14840
i=johann
i=shadow
i=panda
---

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index be69dc5..c148467 100644
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -524,6 +524,8 @@ struct ptlrpc_thread {
         __u32 t_flags;
 
         unsigned int t_id; /* service thread index, from ptlrpc_start_threads */
+        struct lc_watchdog *t_watchdog; /* put watchdog in the structure per
+                                         * thread b=14840 */
         cfs_waitq_t t_ctl_waitq;
 };