From: zhanghc <zhanghc>
Date: Wed, 17 Jun 2009 07:36:28 +0000 (+0000)
Subject: b=19259
X-Git-Tag: v1_8_2_01~1^2~316
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=25f36a4ea0d762a94ad16ce678d2e1ae18b9a0d1;p=fs%2Flustre-release.git

b=19259

add a NULL proc in osc_destroy to allow
the blocking thread to process LUSTRE_FATAL_SIGS

i=adilger@sun.com
i=johann@sun.com
---

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 38d0ad0..f039f9b 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -680,7 +680,8 @@ static int osc_destroy(struct obd_export *exp, struct obdo *oa,
         if (!(cli->cl_import->imp_connect_flags_orig & OBD_CONNECT_MDS)) {
                 req->rq_interpret_reply = osc_destroy_interpret;
                 if (!osc_can_send_destroy(cli)) {
-                        struct l_wait_info lwi = { 0 };
+                        struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP,
+                                                          NULL);
 
                         /*
                          * Wait until the number of on-going destroy RPCs drops