LU-6032 ldlm: don't disable softirq for exp_rpc_lock

[fs/lustre-release.git] / lustre / ptlrpc / service.c

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 0bb0175..4cbab10 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -993,18 +993,18 @@ void ptlrpc_request_change_export(struct ptlrpc_request *req,
        if (req->rq_export != NULL) {
                LASSERT(!list_empty(&req->rq_exp_list));
                /* remove rq_exp_list from last export */
-               spin_lock_bh(&req->rq_export->exp_rpc_lock);
+               spin_lock(&req->rq_export->exp_rpc_lock);
                list_del_init(&req->rq_exp_list);
-               spin_unlock_bh(&req->rq_export->exp_rpc_lock);
+               spin_unlock(&req->rq_export->exp_rpc_lock);
                /* export has one reference already, so it`s safe to
                 * add req to export queue here and get another
                 * reference for request later */
-               spin_lock_bh(&export->exp_rpc_lock);
+               spin_lock(&export->exp_rpc_lock);
                if (req->rq_ops != NULL) /* hp request */
                        list_add(&req->rq_exp_list, &export->exp_hp_rpcs);
                else
                        list_add(&req->rq_exp_list, &export->exp_reg_rpcs);
-               spin_unlock_bh(&export->exp_rpc_lock);
+               spin_unlock(&export->exp_rpc_lock);
 
                class_export_rpc_dec(req->rq_export);
                class_export_put(req->rq_export);
@@ -1635,9 +1635,9 @@ static void ptlrpc_server_hpreq_fini(struct ptlrpc_request *req)
                if (req->rq_ops && req->rq_ops->hpreq_fini)
                        req->rq_ops->hpreq_fini(req);
 
-               spin_lock_bh(&req->rq_export->exp_rpc_lock);
+               spin_lock(&req->rq_export->exp_rpc_lock);
                list_del_init(&req->rq_exp_list);
-               spin_unlock_bh(&req->rq_export->exp_rpc_lock);
+               spin_unlock(&req->rq_export->exp_rpc_lock);
        }
        EXIT;
 }