revert bug 16839

Branch b1_6

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index bf7ad76..6f37274 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -39,14 +39,6 @@ tbd Sun Microsystems, Inc.
          old (verbose) output can be obtained by using -v option.
 
 Severity   : normal
-Bugzilla   : 16839
-Frequency  : rare, on restart ost
-Description: llog_receptor_accept() ASSERTION(ctxt)
-Details    : if ost is restarted before set_info(KEY_MDS_CONN) finished, this
-             request will resend before finished ost llog init and this produce
-             access to non init llog context.
-
-Severity   : normal
 Bugzilla   : 15927
 Frequency  : rare
 Description: replace ptlrpcd with the statahead thread to interpret the async

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index a439d01..1555d61 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -3477,7 +3477,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)
@@ -3624,10 +3623,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);