revert bug 16839

Branch b1_8_gate

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 3767499..e5df419 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -3518,7 +3518,6 @@ static int osc_get_info(struct obd_export *exp, obd_count keylen,
                         RETURN(-ENOMEM);
 
                 size[REPLY_REC_OFF] = *vallen;
-                req->rq_no_delay = req->rq_no_resend = 1;
                 ptlrpc_req_set_repsize(req, 2, size);
                 rc = ptlrpc_queue_wait(req);
                 if (rc)
@@ -3665,10 +3664,8 @@ static int osc_set_info_async(struct obd_export *exp, obd_count keylen,
         if (req == NULL)
                 RETURN(-ENOMEM);
 
-        if (KEY_IS(KEY_MDS_CONN)) {
+        if (KEY_IS(KEY_MDS_CONN))
                 req->rq_interpret_reply = osc_setinfo_mds_conn_interpret;
-                req->rq_no_delay = req->rq_no_resend = 1;
-        }
 
         ptlrpc_req_set_repsize(req, 1, NULL);
         ptlrpc_set_add_req(set, req);