From 11772b25c389b230614b92ff97273f167444f450 Mon Sep 17 00:00:00 2001 From: tianzy Date: Thu, 11 Sep 2008 14:51:33 +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/obdfilter/filter_io_24.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/obdfilter/filter_io_24.c b/lustre/obdfilter/filter_io_24.c index c3652a9..dd24c9f 100644 --- a/lustre/obdfilter/filter_io_24.c +++ b/lustre/obdfilter/filter_io_24.c @@ -396,7 +396,8 @@ void filter_free_iobuf(struct filter_iobuf *buf) void filter_iobuf_put(struct filter_obd *filter, struct filter_iobuf *iobuf, struct obd_trans_info *oti) { - int thread_id = oti ? oti->oti_thread_id : -1; + int thread_id = (oti && oti->oti_thread) ? + oti->oti_thread->t_id : -1; if (unlikely(thread_id < 0)) { filter_free_iobuf(iobuf); -- 1.8.3.1