From: yangsheng <sheng.yang@sun.com>
Date: Sat, 19 Dec 2009 17:43:56 +0000 (+0800)
Subject: b=18213 really interrupt the sleep in osc_enter_cache on signals
X-Git-Tag: v1_8_1_59~14
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=ca1d9b7a023d1a04e1773b6ac5bbd86a7d5a9ca3;p=fs%2Flustre-release.git

b=18213 really interrupt the sleep in osc_enter_cache on signals

i=zhanghc
i=yangsheng
---

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index abb9096..587656c 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -2737,7 +2737,7 @@ static int osc_enter_cache(struct client_obd *cli, struct lov_oinfo *loi,
                            struct osc_async_page *oap)
 {
         struct osc_cache_waiter ocw;
-        struct l_wait_info lwi = { 0 };
+        struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL);
         ENTRY;
 
         CDEBUG(D_CACHE, "dirty: %ld/%d dirty_max: %ld/%d dropped: %lu "