staging: lustre: ptlrpc: request gets stuck in UNREGISTERING phase

Exit condition from UNREGISTERING phase is releasing of
both reply and bulk buffers.

Call ptlrpc_unregister_bulk() if ptlrpc_unregister_reply()
wasn't completed in async mode before switching to
UNREGISTERING phase.

Signed-off-by: Andriy Skulysh <Andriy_Skulysh@xyratex.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5259
Xyratex-bug-id: MRP-1960
Reviewed-on: http://review.whamcloud.com/10846
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Ann Koehler <amk@cray.com>
Reviewed-by: Liang Zhen <liang.zhen@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c
index f2e71b40b16d176fc189381e22680b16518518f6..bae91bdb5302d425b34c5c0a18b637328114a835 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
@@ -1630,8 +1630,10 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
                            req->rq_waiting || req->rq_wait_ctx) {
                                int status;
 
-                               if (!ptlrpc_unregister_reply(req, 1))
+                               if (!ptlrpc_unregister_reply(req, 1)) {
+                                       ptlrpc_unregister_bulk(req, 1);
                                        continue;
+                               }
 
                                spin_lock(&imp->imp_lock);
                                if (ptlrpc_import_delay_req(imp, req,