From ee0b59b4c86d7388c0ad9280b897660c838b1071 Mon Sep 17 00:00:00 2001 From: tianzy Date: Thu, 11 Sep 2008 14:51:43 +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/quota/quota_internal.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lustre/quota/quota_internal.h b/lustre/quota/quota_internal.h index 0f0a209..a357cbf 100644 --- a/lustre/quota/quota_internal.h +++ b/lustre/quota/quota_internal.h @@ -99,7 +99,8 @@ void qunit_cache_cleanup(void); int qunit_cache_init(void); int qctxt_adjust_qunit(struct obd_device *obd, struct lustre_quota_ctxt *qctxt, - uid_t uid, gid_t gid, __u32 isblk, int wait); + uid_t uid, gid_t gid, __u32 isblk, int wait, + struct obd_trans_info *oti); int qctxt_wait_pending_dqacq(struct lustre_quota_ctxt *qctxt, unsigned int id, unsigned short type, int isblk); int qctxt_init(struct obd_device *obd, dqacq_handler_t handler); @@ -109,6 +110,7 @@ void qslave_start_recovery(struct obd_device *obd, int compute_remquota(struct obd_device *obd, struct lustre_quota_ctxt *qctxt, struct qunit_data *qdata, int isblk); +int check_qm(struct lustre_quota_ctxt *qctxt); /* quota_master.c */ int lustre_dquot_init(void); void lustre_dquot_exit(void); -- 1.8.3.1