From e005f6872d69e50f6279ff80275736ac1ee3a029 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Fri, 12 Sep 2014 16:17:31 +0000 Subject: [PATCH 1/1] Revert "LU-5261 osc: use wait_for_completion_killable() instead" This is causing LU-5446 This reverts commit 2b3663dda896f669c87feb49e7f3c7d85a89cefe. Change-Id: I8bd254137ad0d402bad5f5aac85aa52cd3d47f63 Reviewed-on: http://review.whamcloud.com/11892 Reviewed-by: Oleg Drokin Tested-by: Oleg Drokin --- lustre/osc/osc_io.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c index f60b05b..3317e97 100644 --- a/lustre/osc/osc_io.c +++ b/lustre/osc/osc_io.c @@ -532,10 +532,8 @@ static void osc_io_setattr_end(const struct lu_env *env, int result = 0; if (cbargs->opc_rpc_sent) { - result = wait_for_completion_killable(&cbargs->opc_sync); - if (result == 0) - result = cbargs->opc_rc; - io->ci_result = result; + wait_for_completion(&cbargs->opc_sync); + result = io->ci_result = cbargs->opc_rc; } if (result == 0) { if (oio->oi_lockless) { @@ -680,7 +678,7 @@ static void osc_io_fsync_end(const struct lu_env *env, struct osc_io *oio = cl2osc_io(env, slice); struct osc_async_cbargs *cbargs = &oio->oi_cbarg; - result = wait_for_completion_killable(&cbargs->opc_sync); + wait_for_completion(&cbargs->opc_sync); if (result == 0) result = cbargs->opc_rc; } -- 1.8.3.1