From a37f4f36ece0b991071a4084544c48b8101d045b Mon Sep 17 00:00:00 2001 From: tianzy Date: Thu, 11 Sep 2008 14:51:24 +0000 Subject: [PATCH] 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 --- lustre/include/obd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/include/obd.h b/lustre/include/obd.h index 3b671c7..9bf4a0b 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -750,7 +750,7 @@ struct obd_trans_info { int oti_numcookies; /* initial thread handling transaction */ - int oti_thread_id; + struct ptlrpc_thread * oti_thread; __u32 oti_conn_cnt; /* VBR: versions */ __u64 oti_pre_version; @@ -781,7 +781,7 @@ static inline void oti_init(struct obd_trans_info *oti, /* called from mds_create_objects */ if (req->rq_repmsg != NULL) oti->oti_transno = lustre_msg_get_transno(req->rq_repmsg); - oti->oti_thread_id = req->rq_svc_thread ? req->rq_svc_thread->t_id : -1; + oti->oti_thread = req->rq_svc_thread; if (req->rq_reqmsg != NULL) oti->oti_conn_cnt = lustre_msg_get_conn_cnt(req->rq_reqmsg); } -- 1.8.3.1