From 8a075ae060d62375c8e4cb416bac9447dcf8312d Mon Sep 17 00:00:00 2001 From: yury Date: Mon, 24 Nov 2008 13:34:41 +0000 Subject: [PATCH] b=17631 r=shadow,panda - fixes long bulk unlink done synchronously in ptlrpcd thread which could cause asserion in umount time; --- lustre/ptlrpc/service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index 175b62f..f32d283 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -1880,7 +1880,8 @@ int ptlrpc_unregister_service(struct ptlrpc_service *service) /* Network access will complete in finite time but the HUGE * timeout lets us CWARN for visibility of sluggish NALs */ - lwi = LWI_TIMEOUT(cfs_time_seconds(LONG_UNLINK), NULL, NULL); + lwi = LWI_TIMEOUT_INTERVAL(cfs_time_seconds(LONG_UNLINK), + cfs_time_seconds(1), NULL, NULL); rc = l_wait_event(service->srv_waitq, service->srv_nrqbd_receiving == 0, &lwi); -- 1.8.3.1