Whamcloud - gitweb
b=20997 Enable time limit on the request to be queued
[fs/lustre-release.git] / lustre / ptlrpc / client.c
index 2d3f29a..7802282 100644 (file)
@@ -1,23 +1,37 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
+ * GPL HEADER START
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
 #include <liblustre.h>
 #endif
 
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_ha.h>
-#include <linux/lustre_import.h>
-#include <linux/lustre_sec.h>
+#include <obd_support.h>
+#include <obd_class.h>
+#include <lustre_lib.h>
+#include <lustre_ha.h>
+#include <lustre_import.h>
+#include <lustre_req_layout.h>
 
 #include "ptlrpc_internal.h"
 
@@ -47,16 +61,17 @@ void ptlrpc_init_client(int req_portal, int rep_portal, char *name,
 struct ptlrpc_connection *ptlrpc_uuid_to_connection(struct obd_uuid *uuid)
 {
         struct ptlrpc_connection *c;
-        struct ptlrpc_peer peer;
-        int err;
+        lnet_nid_t                self;
+        lnet_process_id_t         peer;
+        int                       err;
 
-        err = ptlrpc_uuid_to_peer(uuid, &peer);
+        err = ptlrpc_uuid_to_peer(uuid, &peer, &self);
         if (err != 0) {
                 CERROR("cannot find peer %s!\n", uuid->uuid);
                 return NULL;
         }
 
-        c = ptlrpc_get_connection(&peer, uuid);
+        c = ptlrpc_connection_get(peer, self, uuid);
         if (c) {
                 memcpy(c->c_remote_uuid.uuid,
                        uuid->uuid, sizeof(c->c_remote_uuid.uuid));
@@ -67,22 +82,6 @@ struct ptlrpc_connection *ptlrpc_uuid_to_connection(struct obd_uuid *uuid)
         return c;
 }
 
-void ptlrpc_readdress_connection(struct ptlrpc_connection *conn,
-                                 struct obd_uuid *uuid)
-{
-        struct ptlrpc_peer peer;
-        int err;
-
-        err = ptlrpc_uuid_to_peer(uuid, &peer);
-        if (err != 0) {
-                CERROR("cannot find peer %s!\n", uuid->uuid);
-                return;
-        }
-
-        memcpy(&conn->c_peer, &peer, sizeof (peer));
-        return;
-}
-
 static inline struct ptlrpc_bulk_desc *new_bulk(int npages, int type, int portal)
 {
         struct ptlrpc_bulk_desc *desc;
@@ -91,23 +90,24 @@ static inline struct ptlrpc_bulk_desc *new_bulk(int npages, int type, int portal
         if (!desc)
                 return NULL;
 
-        spin_lock_init(&desc->bd_lock);
-        init_waitqueue_head(&desc->bd_waitq);
+        cfs_spin_lock_init(&desc->bd_lock);
+        cfs_waitq_init(&desc->bd_waitq);
         desc->bd_max_iov = npages;
         desc->bd_iov_count = 0;
-        desc->bd_md_h = PTL_INVALID_HANDLE;
+        LNetInvalidateHandle(&desc->bd_md_h);
         desc->bd_portal = portal;
         desc->bd_type = type;
-        
+
         return desc;
 }
 
-struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_imp (struct ptlrpc_request *req,
-                                               int npages, int type, int portal)
+struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_imp(struct ptlrpc_request *req,
+                                              int npages, int type, int portal)
 {
         struct obd_import *imp = req->rq_import;
         struct ptlrpc_bulk_desc *desc;
 
+        ENTRY;
         LASSERT(type == BULK_PUT_SINK || type == BULK_GET_SOURCE);
         desc = new_bulk(npages, type, portal);
         if (desc == NULL)
@@ -126,12 +126,13 @@ struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_imp (struct ptlrpc_request *req,
         return desc;
 }
 
-struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_exp (struct ptlrpc_request *req,
-                                               int npages, int type, int portal)
+struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_exp(struct ptlrpc_request *req,
+                                              int npages, int type, int portal)
 {
         struct obd_export *exp = req->rq_export;
         struct ptlrpc_bulk_desc *desc;
 
+        ENTRY;
         LASSERT(type == BULK_PUT_SOURCE || type == BULK_GET_SINK);
 
         desc = new_bulk(npages, type, portal);
@@ -151,13 +152,13 @@ struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_exp (struct ptlrpc_request *req,
 }
 
 void ptlrpc_prep_bulk_page(struct ptlrpc_bulk_desc *desc,
-                           struct page *page, int pageoffset, int len)
+                           cfs_page_t *page, int pageoffset, int len)
 {
         LASSERT(desc->bd_iov_count < desc->bd_max_iov);
         LASSERT(page != NULL);
         LASSERT(pageoffset >= 0);
         LASSERT(len > 0);
-        LASSERT(pageoffset + len <= PAGE_SIZE);
+        LASSERT(pageoffset + len <= CFS_PAGE_SIZE);
 
         desc->bd_nob += len;
 
@@ -172,109 +173,586 @@ void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc)
         LASSERT(desc->bd_iov_count != LI_POISON); /* not freed already */
         LASSERT(!desc->bd_network_rw);         /* network hands off or */
         LASSERT((desc->bd_export != NULL) ^ (desc->bd_import != NULL));
+
+        sptlrpc_enc_pool_put_pages(desc);
+
         if (desc->bd_export)
                 class_export_put(desc->bd_export);
         else
                 class_import_put(desc->bd_import);
 
-        OBD_FREE(desc, offsetof(struct ptlrpc_bulk_desc, 
+        OBD_FREE(desc, offsetof(struct ptlrpc_bulk_desc,
                                 bd_iov[desc->bd_max_iov]));
         EXIT;
 }
 
-/* FIXME prep_req now should return error code other than NULL. but
- * this is called everywhere :(
- */
-struct ptlrpc_request *ptlrpc_prep_req(struct obd_import *imp, __u32 version,
-                                       int opcode, int count, int *lengths,
-                                       char **bufs)
+/* Set server timelimit for this req */
+void ptlrpc_at_set_req_timeout(struct ptlrpc_request *req)
+{
+        __u32 serv_est;
+        int idx;
+        struct imp_at *at;
+
+        LASSERT(req->rq_import);
+
+        if (AT_OFF) {
+                /* non-AT settings */
+                req->rq_timeout = req->rq_import->imp_server_timeout ?
+                                  obd_timeout / 2 : obd_timeout;
+        } else {
+                at = &req->rq_import->imp_at;
+                idx = import_at_get_index(req->rq_import,
+                                          req->rq_request_portal);
+                serv_est = at_get(&at->iat_service_estimate[idx]);
+                req->rq_timeout = at_est2timeout(serv_est);
+        }
+        /* We could get even fancier here, using history to predict increased
+           loading... */
+
+        /* Let the server know what this RPC timeout is by putting it in the
+           reqmsg*/
+        lustre_msg_set_timeout(req->rq_reqmsg, req->rq_timeout);
+}
+
+/* Adjust max service estimate based on server value */
+static void ptlrpc_at_adj_service(struct ptlrpc_request *req,
+                                  unsigned int serv_est)
+{
+        int idx;
+        unsigned int oldse;
+        struct imp_at *at;
+
+        LASSERT(req->rq_import);
+        at = &req->rq_import->imp_at;
+
+        idx = import_at_get_index(req->rq_import, req->rq_request_portal);
+        /* max service estimates are tracked on the server side,
+           so just keep minimal history here */
+        oldse = at_measured(&at->iat_service_estimate[idx], serv_est);
+        if (oldse != 0)
+                CDEBUG(D_ADAPTTO, "The RPC service estimate for %s ptl %d "
+                       "has changed from %d to %d\n",
+                       req->rq_import->imp_obd->obd_name,req->rq_request_portal,
+                       oldse, at_get(&at->iat_service_estimate[idx]));
+}
+
+/* Expected network latency per remote node (secs) */
+int ptlrpc_at_get_net_latency(struct ptlrpc_request *req)
+{
+        return AT_OFF ? 0 : at_get(&req->rq_import->imp_at.iat_net_latency);
+}
+
+/* Adjust expected network latency */
+static void ptlrpc_at_adj_net_latency(struct ptlrpc_request *req,
+                                      unsigned int service_time)
+{
+        unsigned int nl, oldnl;
+        struct imp_at *at;
+        time_t now = cfs_time_current_sec();
+
+        LASSERT(req->rq_import);
+        at = &req->rq_import->imp_at;
+
+        /* Network latency is total time less server processing time */
+        nl = max_t(int, now - req->rq_sent - service_time, 0) +1/*st rounding*/;
+        if (service_time > now - req->rq_sent + 3 /* bz16408 */)
+                CWARN("Reported service time %u > total measured time "
+                      CFS_DURATION_T"\n", service_time,
+                      cfs_time_sub(now, req->rq_sent));
+
+        oldnl = at_measured(&at->iat_net_latency, nl);
+        if (oldnl != 0)
+                CDEBUG(D_ADAPTTO, "The network latency for %s (nid %s) "
+                       "has changed from %d to %d\n",
+                       req->rq_import->imp_obd->obd_name,
+                       obd_uuid2str(
+                               &req->rq_import->imp_connection->c_remote_uuid),
+                       oldnl, at_get(&at->iat_net_latency));
+}
+
+static int unpack_reply(struct ptlrpc_request *req)
 {
-        struct ptlrpc_request *request;
         int rc;
-        ENTRY;
 
-        LASSERT((unsigned long)imp > 0x1000);
+        if (SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc) != SPTLRPC_POLICY_NULL) {
+                rc = ptlrpc_unpack_rep_msg(req, req->rq_replen);
+                if (rc) {
+                        DEBUG_REQ(D_ERROR, req, "unpack_rep failed: %d", rc);
+                        return(-EPROTO);
+                }
+        }
 
-        OBD_ALLOC(request, sizeof(*request));
-        if (!request) {
-                CERROR("request allocation out of memory\n");
-                RETURN(NULL);
+        rc = lustre_unpack_rep_ptlrpc_body(req, MSG_PTLRPC_BODY_OFF);
+        if (rc) {
+                DEBUG_REQ(D_ERROR, req, "unpack ptlrpc body failed: %d", rc);
+                return(-EPROTO);
         }
+        return 0;
+}
 
-        request->rq_import = class_import_get(imp);
+/*
+ * Handle an early reply message, called with the rq_lock held.
+ * If anything goes wrong just ignore it - same as if it never happened
+ */
+static int ptlrpc_at_recv_early_reply(struct ptlrpc_request *req)
+{
+        struct ptlrpc_request *early_req;
+        time_t                 olddl;
+        int                    rc;
+        ENTRY;
 
-        rc = ptlrpcs_req_get_cred(request);
+        req->rq_early = 0;
+        cfs_spin_unlock(&req->rq_lock);
+
+        rc = sptlrpc_cli_unwrap_early_reply(req, &early_req);
         if (rc) {
-                CDEBUG(D_SEC, "failed to get credential\n");
-                GOTO(out_free, rc);
+                cfs_spin_lock(&req->rq_lock);
+                RETURN(rc);
         }
 
-        /* try to refresh the cred. we do this here in order to let fewer
-         * refresh be performed in ptlrpcd context (which might block ptlrpcd).
-         * fail out only if a fatal ptlrpcs error occured.
-         */
-        ptlrpcs_req_refresh_cred(request);
-        if (request->rq_ptlrpcs_err)
-                GOTO(out_cred, rc = -EPERM);
+        rc = unpack_reply(early_req);
+        if (rc == 0) {
+                /* Expecting to increase the service time estimate here */
+                ptlrpc_at_adj_service(req,
+                        lustre_msg_get_timeout(early_req->rq_repmsg));
+                ptlrpc_at_adj_net_latency(req,
+                        lustre_msg_get_service_time(early_req->rq_repmsg));
+        }
 
-        rc = lustre_pack_request(request, count, lengths, bufs);
-        if (rc) {
-                CERROR("cannot pack request %d\n", rc);
-                GOTO(out_cred, rc);
+        sptlrpc_cli_finish_early_reply(early_req);
+
+        cfs_spin_lock(&req->rq_lock);
+
+        if (rc == 0) {
+                /* Adjust the local timeout for this req */
+                ptlrpc_at_set_req_timeout(req);
+
+                olddl = req->rq_deadline;
+                /* server assumes it now has rq_timeout from when it sent the
+                   early reply, so client should give it at least that long. */
+                req->rq_deadline = cfs_time_current_sec() + req->rq_timeout +
+                            ptlrpc_at_get_net_latency(req);
+
+                DEBUG_REQ(D_ADAPTTO, req,
+                          "Early reply #%d, new deadline in "CFS_DURATION_T"s "
+                          "("CFS_DURATION_T"s)", req->rq_early_count,
+                          cfs_time_sub(req->rq_deadline,
+                                       cfs_time_current_sec()),
+                          cfs_time_sub(req->rq_deadline, olddl));
         }
-        request->rq_reqmsg->version |= version;
 
-        if (imp->imp_server_timeout)
-                request->rq_timeout = obd_timeout / 2;
-        else
-                request->rq_timeout = obd_timeout;
+        RETURN(rc);
+}
 
+void ptlrpc_free_rq_pool(struct ptlrpc_request_pool *pool)
+{
+        cfs_list_t *l, *tmp;
+        struct ptlrpc_request *req;
+
+        LASSERT(pool != NULL);
+
+        cfs_spin_lock(&pool->prp_lock);
+        cfs_list_for_each_safe(l, tmp, &pool->prp_req_list) {
+                req = cfs_list_entry(l, struct ptlrpc_request, rq_list);
+                cfs_list_del(&req->rq_list);
+                LASSERT(req->rq_reqbuf);
+                LASSERT(req->rq_reqbuf_len == pool->prp_rq_size);
+                OBD_FREE(req->rq_reqbuf, pool->prp_rq_size);
+                OBD_FREE(req, sizeof(*req));
+        }
+        cfs_spin_unlock(&pool->prp_lock);
+        OBD_FREE(pool, sizeof(*pool));
+}
+
+void ptlrpc_add_rqs_to_pool(struct ptlrpc_request_pool *pool, int num_rq)
+{
+        int i;
+        int size = 1;
+
+        while (size < pool->prp_rq_size)
+                size <<= 1;
+
+        LASSERTF(cfs_list_empty(&pool->prp_req_list) ||
+                 size == pool->prp_rq_size,
+                 "Trying to change pool size with nonempty pool "
+                 "from %d to %d bytes\n", pool->prp_rq_size, size);
+
+        cfs_spin_lock(&pool->prp_lock);
+        pool->prp_rq_size = size;
+        for (i = 0; i < num_rq; i++) {
+                struct ptlrpc_request *req;
+                struct lustre_msg *msg;
+
+                cfs_spin_unlock(&pool->prp_lock);
+                OBD_ALLOC(req, sizeof(struct ptlrpc_request));
+                if (!req)
+                        return;
+                OBD_ALLOC_GFP(msg, size, CFS_ALLOC_STD);
+                if (!msg) {
+                        OBD_FREE(req, sizeof(struct ptlrpc_request));
+                        return;
+                }
+                req->rq_reqbuf = msg;
+                req->rq_reqbuf_len = size;
+                req->rq_pool = pool;
+                cfs_spin_lock(&pool->prp_lock);
+                cfs_list_add_tail(&req->rq_list, &pool->prp_req_list);
+        }
+        cfs_spin_unlock(&pool->prp_lock);
+        return;
+}
+
+struct ptlrpc_request_pool *
+ptlrpc_init_rq_pool(int num_rq, int msgsize,
+                    void (*populate_pool)(struct ptlrpc_request_pool *, int))
+{
+        struct ptlrpc_request_pool *pool;
+
+        OBD_ALLOC(pool, sizeof (struct ptlrpc_request_pool));
+        if (!pool)
+                return NULL;
+
+        /* Request next power of two for the allocation, because internally
+           kernel would do exactly this */
+
+        cfs_spin_lock_init(&pool->prp_lock);
+        CFS_INIT_LIST_HEAD(&pool->prp_req_list);
+        pool->prp_rq_size = msgsize + SPTLRPC_MAX_PAYLOAD;
+        pool->prp_populate = populate_pool;
+
+        populate_pool(pool, num_rq);
+
+        if (cfs_list_empty(&pool->prp_req_list)) {
+                /* have not allocated a single request for the pool */
+                OBD_FREE(pool, sizeof (struct ptlrpc_request_pool));
+                pool = NULL;
+        }
+        return pool;
+}
+
+static struct ptlrpc_request *
+ptlrpc_prep_req_from_pool(struct ptlrpc_request_pool *pool)
+{
+        struct ptlrpc_request *request;
+        struct lustre_msg *reqbuf;
+
+        if (!pool)
+                return NULL;
+
+        cfs_spin_lock(&pool->prp_lock);
+
+        /* See if we have anything in a pool, and bail out if nothing,
+         * in writeout path, where this matters, this is safe to do, because
+         * nothing is lost in this case, and when some in-flight requests
+         * complete, this code will be called again. */
+        if (unlikely(cfs_list_empty(&pool->prp_req_list))) {
+                cfs_spin_unlock(&pool->prp_lock);
+                return NULL;
+        }
+
+        request = cfs_list_entry(pool->prp_req_list.next, struct ptlrpc_request,
+                                 rq_list);
+        cfs_list_del_init(&request->rq_list);
+        cfs_spin_unlock(&pool->prp_lock);
+
+        LASSERT(request->rq_reqbuf);
+        LASSERT(request->rq_pool);
+
+        reqbuf = request->rq_reqbuf;
+        memset(request, 0, sizeof(*request));
+        request->rq_reqbuf = reqbuf;
+        request->rq_reqbuf_len = pool->prp_rq_size;
+        request->rq_pool = pool;
+
+        return request;
+}
+
+static void __ptlrpc_free_req_to_pool(struct ptlrpc_request *request)
+{
+        struct ptlrpc_request_pool *pool = request->rq_pool;
+
+        cfs_spin_lock(&pool->prp_lock);
+        LASSERT(cfs_list_empty(&request->rq_list));
+        LASSERT(!request->rq_receiving_reply);
+        cfs_list_add_tail(&request->rq_list, &pool->prp_req_list);
+        cfs_spin_unlock(&pool->prp_lock);
+}
+
+static int __ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
+                                      __u32 version, int opcode,
+                                      int count, __u32 *lengths, char **bufs,
+                                      struct ptlrpc_cli_ctx *ctx)
+{
+        struct obd_import  *imp = request->rq_import;
+        int                 rc;
+        ENTRY;
+
+        if (unlikely(ctx))
+                request->rq_cli_ctx = sptlrpc_cli_ctx_get(ctx);
+        else {
+                rc = sptlrpc_req_get_ctx(request);
+                if (rc)
+                        GOTO(out_free, rc);
+        }
+
+        sptlrpc_req_set_flavor(request, opcode);
+
+        rc = lustre_pack_request(request, imp->imp_msg_magic, count,
+                                 lengths, bufs);
+        if (rc) {
+                LASSERT(!request->rq_pool);
+                GOTO(out_ctx, rc);
+        }
+
+        lustre_msg_add_version(request->rq_reqmsg, version);
         request->rq_send_state = LUSTRE_IMP_FULL;
         request->rq_type = PTL_RPC_MSG_REQUEST;
+        request->rq_export = NULL;
 
         request->rq_req_cbid.cbid_fn  = request_out_callback;
         request->rq_req_cbid.cbid_arg = request;
 
         request->rq_reply_cbid.cbid_fn  = reply_in_callback;
         request->rq_reply_cbid.cbid_arg = request;
-        
+
+        request->rq_reply_deadline = 0;
         request->rq_phase = RQ_PHASE_NEW;
+        request->rq_next_phase = RQ_PHASE_UNDEFINED;
 
-        /* XXX FIXME bug 249 */
         request->rq_request_portal = imp->imp_client->cli_request_portal;
         request->rq_reply_portal = imp->imp_client->cli_reply_portal;
 
-        spin_lock_init(&request->rq_lock);
-        INIT_LIST_HEAD(&request->rq_list);
-        INIT_LIST_HEAD(&request->rq_replay_list);
-        INIT_LIST_HEAD(&request->rq_set_chain);
-        init_waitqueue_head(&request->rq_reply_waitq);
+        ptlrpc_at_set_req_timeout(request);
+
+        cfs_spin_lock_init(&request->rq_lock);
+        CFS_INIT_LIST_HEAD(&request->rq_list);
+        CFS_INIT_LIST_HEAD(&request->rq_timed_list);
+        CFS_INIT_LIST_HEAD(&request->rq_replay_list);
+        CFS_INIT_LIST_HEAD(&request->rq_ctx_chain);
+        CFS_INIT_LIST_HEAD(&request->rq_set_chain);
+        CFS_INIT_LIST_HEAD(&request->rq_history_list);
+        CFS_INIT_LIST_HEAD(&request->rq_exp_list);
+        cfs_waitq_init(&request->rq_reply_waitq);
+        cfs_waitq_init(&request->rq_set_waitq);
         request->rq_xid = ptlrpc_next_xid();
-        atomic_set(&request->rq_refcount, 1);
+        cfs_atomic_set(&request->rq_refcount, 1);
 
-        request->rq_reqmsg->opc = opcode;
-        request->rq_reqmsg->flags = 0;
-        RETURN(request);
-out_cred:
-        ptlrpcs_req_drop_cred(request);
+        lustre_msg_set_opc(request->rq_reqmsg, opcode);
+
+        RETURN(0);
+out_ctx:
+        sptlrpc_cli_ctx_put(request->rq_cli_ctx, 1);
 out_free:
         class_import_put(imp);
-        OBD_FREE(request, sizeof(*request));
-        RETURN(NULL);
+        return rc;
+}
+
+int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
+                             __u32 version, int opcode, char **bufs,
+                             struct ptlrpc_cli_ctx *ctx)
+{
+        int count;
+
+        count = req_capsule_filled_sizes(&request->rq_pill, RCL_CLIENT);
+        return __ptlrpc_request_bufs_pack(request, version, opcode, count,
+                                          request->rq_pill.rc_area[RCL_CLIENT],
+                                          bufs, ctx);
+}
+EXPORT_SYMBOL(ptlrpc_request_bufs_pack);
+
+int ptlrpc_request_pack(struct ptlrpc_request *request,
+                        __u32 version, int opcode)
+{
+        return ptlrpc_request_bufs_pack(request, version, opcode, NULL, NULL);
+}
+
+static inline
+struct ptlrpc_request *__ptlrpc_request_alloc(struct obd_import *imp,
+                                              struct ptlrpc_request_pool *pool)
+{
+        struct ptlrpc_request *request = NULL;
+
+        if (pool)
+                request = ptlrpc_prep_req_from_pool(pool);
+
+        if (!request)
+                OBD_ALLOC_PTR(request);
+
+        if (request) {
+                LASSERTF((unsigned long)imp > 0x1000, "%p", imp);
+                LASSERT(imp != LP_POISON);
+                LASSERTF((unsigned long)imp->imp_client > 0x1000, "%p",
+                        imp->imp_client);
+                LASSERT(imp->imp_client != LP_POISON);
+
+                request->rq_import = class_import_get(imp);
+        } else {
+                CERROR("request allocation out of memory\n");
+        }
+
+        return request;
+}
+
+static struct ptlrpc_request *
+ptlrpc_request_alloc_internal(struct obd_import *imp,
+                              struct ptlrpc_request_pool * pool,
+                              const struct req_format *format)
+{
+        struct ptlrpc_request *request;
+
+        request = __ptlrpc_request_alloc(imp, pool);
+        if (request == NULL)
+                return NULL;
+
+        req_capsule_init(&request->rq_pill, request, RCL_CLIENT);
+        req_capsule_set(&request->rq_pill, format);
+        return request;
+}
+
+struct ptlrpc_request *ptlrpc_request_alloc(struct obd_import *imp,
+                                            const struct req_format *format)
+{
+        return ptlrpc_request_alloc_internal(imp, NULL, format);
 }
 
+struct ptlrpc_request *ptlrpc_request_alloc_pool(struct obd_import *imp,
+                                            struct ptlrpc_request_pool * pool,
+                                            const struct req_format *format)
+{
+        return ptlrpc_request_alloc_internal(imp, pool, format);
+}
+
+void ptlrpc_request_free(struct ptlrpc_request *request)
+{
+        if (request->rq_pool)
+                __ptlrpc_free_req_to_pool(request);
+        else
+                OBD_FREE_PTR(request);
+}
+
+struct ptlrpc_request *ptlrpc_request_alloc_pack(struct obd_import *imp,
+                                                const struct req_format *format,
+                                                __u32 version, int opcode)
+{
+        struct ptlrpc_request *req = ptlrpc_request_alloc(imp, format);
+        int                    rc;
+
+        if (req) {
+                rc = ptlrpc_request_pack(req, version, opcode);
+                if (rc) {
+                        ptlrpc_request_free(req);
+                        req = NULL;
+                }
+        }
+        return req;
+}
+
+struct ptlrpc_request *
+ptlrpc_prep_req_pool(struct obd_import *imp,
+                     __u32 version, int opcode,
+                     int count, __u32 *lengths, char **bufs,
+                     struct ptlrpc_request_pool *pool)
+{
+        struct ptlrpc_request *request;
+        int                    rc;
+
+        request = __ptlrpc_request_alloc(imp, pool);
+        if (!request)
+                return NULL;
+
+        rc = __ptlrpc_request_bufs_pack(request, version, opcode, count,
+                                        lengths, bufs, NULL);
+        if (rc) {
+                ptlrpc_request_free(request);
+                request = NULL;
+        }
+        return request;
+}
+
+struct ptlrpc_request *
+ptlrpc_prep_req(struct obd_import *imp, __u32 version, int opcode, int count,
+                __u32 *lengths, char **bufs)
+{
+        return ptlrpc_prep_req_pool(imp, version, opcode, count, lengths, bufs,
+                                    NULL);
+}
+
+struct ptlrpc_request *ptlrpc_prep_fakereq(struct obd_import *imp,
+                                           unsigned int timeout,
+                                           ptlrpc_interpterer_t interpreter)
+{
+        struct ptlrpc_request *request = NULL;
+        ENTRY;
+
+        OBD_ALLOC(request, sizeof(*request));
+        if (!request) {
+                CERROR("request allocation out of memory\n");
+                RETURN(NULL);
+        }
+
+        request->rq_send_state = LUSTRE_IMP_FULL;
+        request->rq_type = PTL_RPC_MSG_REQUEST;
+        request->rq_import = class_import_get(imp);
+        request->rq_export = NULL;
+        request->rq_import_generation = imp->imp_generation;
+
+        request->rq_timeout = timeout;
+        request->rq_sent = cfs_time_current_sec();
+        request->rq_deadline = request->rq_sent + timeout;
+        request->rq_reply_deadline = request->rq_deadline;
+        request->rq_interpret_reply = interpreter;
+        request->rq_phase = RQ_PHASE_RPC;
+        request->rq_next_phase = RQ_PHASE_INTERPRET;
+        /* don't want reply */
+        request->rq_receiving_reply = 0;
+        request->rq_must_unlink = 0;
+        request->rq_no_delay = request->rq_no_resend = 1;
+        request->rq_fake = 1;
+
+        cfs_spin_lock_init(&request->rq_lock);
+        CFS_INIT_LIST_HEAD(&request->rq_list);
+        CFS_INIT_LIST_HEAD(&request->rq_replay_list);
+        CFS_INIT_LIST_HEAD(&request->rq_set_chain);
+        CFS_INIT_LIST_HEAD(&request->rq_history_list);
+        CFS_INIT_LIST_HEAD(&request->rq_exp_list);
+        cfs_waitq_init(&request->rq_reply_waitq);
+        cfs_waitq_init(&request->rq_set_waitq);
+
+        request->rq_xid = ptlrpc_next_xid();
+        cfs_atomic_set(&request->rq_refcount, 1);
+
+        RETURN(request);
+}
+
+void ptlrpc_fakereq_finished(struct ptlrpc_request *req)
+{
+        /* if we kill request before timeout - need adjust counter */
+        if (req->rq_phase == RQ_PHASE_RPC) {
+                struct ptlrpc_request_set *set = req->rq_set;
+
+                if (set)
+                        cfs_atomic_dec(&set->set_remaining);
+        }
+
+        ptlrpc_rqphase_move(req, RQ_PHASE_COMPLETE);
+        cfs_list_del_init(&req->rq_list);
+}
+
+
 struct ptlrpc_request_set *ptlrpc_prep_set(void)
 {
         struct ptlrpc_request_set *set;
 
+        ENTRY;
         OBD_ALLOC(set, sizeof *set);
         if (!set)
                 RETURN(NULL);
-        INIT_LIST_HEAD(&set->set_requests);
-        init_waitqueue_head(&set->set_waitq);
-        set->set_remaining = 0;
-        spin_lock_init(&set->set_new_req_lock);
-        INIT_LIST_HEAD(&set->set_new_requests);
+        CFS_INIT_LIST_HEAD(&set->set_requests);
+        cfs_waitq_init(&set->set_waitq);
+        cfs_atomic_set(&set->set_remaining, 0);
+        cfs_spin_lock_init(&set->set_new_req_lock);
+        CFS_INIT_LIST_HEAD(&set->set_new_requests);
+        CFS_INIT_LIST_HEAD(&set->set_cblist);
 
         RETURN(set);
 }
@@ -282,79 +760,103 @@ struct ptlrpc_request_set *ptlrpc_prep_set(void)
 /* Finish with this set; opposite of prep_set. */
 void ptlrpc_set_destroy(struct ptlrpc_request_set *set)
 {
-        struct list_head *tmp;
-        struct list_head *next;
+        cfs_list_t       *tmp;
+        cfs_list_t       *next;
         int               expected_phase;
         int               n = 0;
         ENTRY;
 
         /* Requests on the set should either all be completed, or all be new */
-        expected_phase = (set->set_remaining == 0) ?
+        expected_phase = (cfs_atomic_read(&set->set_remaining) == 0) ?
                          RQ_PHASE_COMPLETE : RQ_PHASE_NEW;
-        list_for_each (tmp, &set->set_requests) {
+        cfs_list_for_each (tmp, &set->set_requests) {
                 struct ptlrpc_request *req =
-                        list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+                        cfs_list_entry(tmp, struct ptlrpc_request,
+                                       rq_set_chain);
 
                 LASSERT(req->rq_phase == expected_phase);
                 n++;
         }
 
-        LASSERT(set->set_remaining == 0 || set->set_remaining == n);
+        LASSERTF(cfs_atomic_read(&set->set_remaining) == 0 || 
+                 cfs_atomic_read(&set->set_remaining) == n, "%d / %d\n",
+                 cfs_atomic_read(&set->set_remaining), n);
 
-        list_for_each_safe(tmp, next, &set->set_requests) {
+        cfs_list_for_each_safe(tmp, next, &set->set_requests) {
                 struct ptlrpc_request *req =
-                        list_entry(tmp, struct ptlrpc_request, rq_set_chain);
-                list_del_init(&req->rq_set_chain);
+                        cfs_list_entry(tmp, struct ptlrpc_request,
+                                       rq_set_chain);
+                cfs_list_del_init(&req->rq_set_chain);
 
                 LASSERT(req->rq_phase == expected_phase);
 
                 if (req->rq_phase == RQ_PHASE_NEW) {
-
-                        if (req->rq_interpret_reply != NULL) {
-                                int (*interpreter)(struct ptlrpc_request *,
-                                                   void *, int) =
-                                        req->rq_interpret_reply;
-
-                                /* higher level (i.e. LOV) failed;
-                                 * let the sub reqs clean up */
-                                req->rq_status = -EBADR;
-                                interpreter(req, &req->rq_async_args,
-                                            req->rq_status);
-                        }
-                        set->set_remaining--;
+                        ptlrpc_req_interpret(NULL, req, -EBADR);
+                        cfs_atomic_dec(&set->set_remaining);
                 }
 
                 req->rq_set = NULL;
                 ptlrpc_req_finished (req);
         }
 
-        LASSERT(set->set_remaining == 0);
+        LASSERT(cfs_atomic_read(&set->set_remaining) == 0);
 
         OBD_FREE(set, sizeof(*set));
         EXIT;
 }
 
+int ptlrpc_set_add_cb(struct ptlrpc_request_set *set,
+                      set_interpreter_func fn, void *data)
+{
+        struct ptlrpc_set_cbdata *cbdata;
+
+        OBD_ALLOC_PTR(cbdata);
+        if (cbdata == NULL)
+                RETURN(-ENOMEM);
+
+        cbdata->psc_interpret = fn;
+        cbdata->psc_data = data;
+        cfs_list_add_tail(&cbdata->psc_item, &set->set_cblist);
+
+        RETURN(0);
+}
+
 void ptlrpc_set_add_req(struct ptlrpc_request_set *set,
                         struct ptlrpc_request *req)
 {
         /* The set takes over the caller's request reference */
-        list_add_tail(&req->rq_set_chain, &set->set_requests);
+        cfs_list_add_tail(&req->rq_set_chain, &set->set_requests);
         req->rq_set = set;
-        set->set_remaining++;
-        atomic_inc(&req->rq_import->imp_inflight);
+        cfs_atomic_inc(&set->set_remaining);
+        req->rq_queued_time = cfs_time_current(); /* Where is the best place to set this? */
 }
 
-/* lock so many callers can add things, the context that owns the set
- * is supposed to notice these and move them into the set proper. */
-void ptlrpc_set_add_new_req(struct ptlrpc_request_set *set,
-                            struct ptlrpc_request *req)
+/**
+ * Lock so many callers can add things, the context that owns the set
+ * is supposed to notice these and move them into the set proper.
+ */
+int ptlrpc_set_add_new_req(struct ptlrpcd_ctl *pc,
+                           struct ptlrpc_request *req)
 {
-        unsigned long flags;
-        spin_lock_irqsave(&set->set_new_req_lock, flags);
-        /* The set takes over the caller's request reference */
-        list_add_tail(&req->rq_set_chain, &set->set_new_requests);
+        struct ptlrpc_request_set *set = pc->pc_set;
+
+        /*
+         * Let caller know that we stopped and will not handle this request.
+         * It needs to take care itself of request.
+         */
+        if (cfs_test_bit(LIOD_STOP, &pc->pc_flags))
+                return -EALREADY;
+
+        cfs_spin_lock(&set->set_new_req_lock);
+        /*
+         * The set takes over the caller's request reference.
+         */
+        cfs_list_add_tail(&req->rq_set_chain, &set->set_new_requests);
         req->rq_set = set;
-        spin_unlock_irqrestore(&set->set_new_req_lock, flags);
+        cfs_spin_unlock(&set->set_new_req_lock);
+
+        cfs_waitq_signal(&set->set_waitq);
+        return 0;
 }
 
 /*
@@ -367,7 +869,7 @@ void ptlrpc_set_add_new_req(struct ptlrpc_request_set *set,
  *
  * The imp->imp_lock must be held.
  */
-static int ptlrpc_import_delay_req(struct obd_import *imp, 
+static int ptlrpc_import_delay_req(struct obd_import *imp,
                                    struct ptlrpc_request *req, int *status)
 {
         int delay = 0;
@@ -376,83 +878,72 @@ static int ptlrpc_import_delay_req(struct obd_import *imp,
         LASSERT (status != NULL);
         *status = 0;
 
-        if (imp->imp_state == LUSTRE_IMP_NEW) {
+        if (req->rq_ctx_init || req->rq_ctx_fini) {
+                /* always allow ctx init/fini rpc go through */
+        } else if (imp->imp_state == LUSTRE_IMP_NEW) {
                 DEBUG_REQ(D_ERROR, req, "Uninitialized import.");
                 *status = -EIO;
                 LBUG();
-        }
-        else if (imp->imp_state == LUSTRE_IMP_CLOSED) {
+        } else if (imp->imp_state == LUSTRE_IMP_CLOSED) {
                 DEBUG_REQ(D_ERROR, req, "IMP_CLOSED ");
                 *status = -EIO;
-        }
-        /* allow CONNECT even if import is invalid */
-        else if (req->rq_send_state == LUSTRE_IMP_CONNECTING &&
-                 imp->imp_state == LUSTRE_IMP_CONNECTING) {
-                ;
-        }
-        /*
-         * If the import has been invalidated (such as by an OST failure), the
-         * request must fail with -EIO.  
-         */
-        else if (imp->imp_invalid) {
-                DEBUG_REQ(D_ERROR, req, "IMP_INVALID");
+        } else if (imp->imp_obd->obd_no_recov) {
+                *status = -ESHUTDOWN;
+        } else if (ptlrpc_send_limit_expired(req)) {
+                /* probably doesn't need to be a D_ERROR after initial testing */
+                DEBUG_REQ(D_ERROR, req, "send limit expired ");
                 *status = -EIO;
-        } 
-        else if (req->rq_import_generation != imp->imp_generation) {
+        } else if (req->rq_send_state == LUSTRE_IMP_CONNECTING &&
+                   imp->imp_state == LUSTRE_IMP_CONNECTING) {
+                /* allow CONNECT even if import is invalid */ ;
+                if (cfs_atomic_read(&imp->imp_inval_count) != 0) {
+                        DEBUG_REQ(D_ERROR, req, "invalidate in flight");
+                        *status = -EIO;
+                }
+        } else if (imp->imp_invalid) {
+                if (!imp->imp_deactive)
+                          DEBUG_REQ(D_ERROR, req, "IMP_INVALID");
+                *status = -ESHUTDOWN; /* bz 12940 */
+        } else if (req->rq_import_generation != imp->imp_generation) {
                 DEBUG_REQ(D_ERROR, req, "req wrong generation:");
                 *status = -EIO;
-        } 
-        else if (req->rq_send_state != imp->imp_state) {
-                if (imp->imp_obd->obd_no_recov || imp->imp_dlm_fake 
-                    || req->rq_no_delay) 
+        } else if (req->rq_send_state != imp->imp_state) {
+                /* invalidate in progress - any requests should be drop */
+                if (cfs_atomic_read(&imp->imp_inval_count) != 0) {
+                        DEBUG_REQ(D_ERROR, req, "invalidate in flight");
+                        *status = -EIO;
+                } else if (imp->imp_dlm_fake || req->rq_no_delay) {
                         *status = -EWOULDBLOCK;
-                else
+                } else {
                         delay = 1;
+                }
         }
 
         RETURN(delay);
 }
 
-static int ptlrpc_check_reply(struct ptlrpc_request *req)
+/* Conditionally suppress specific console messages */
+static int ptlrpc_console_allow(struct ptlrpc_request *req)
 {
-        unsigned long flags;
-        int rc = 0;
-        ENTRY;
-
-        /* serialise with network callback */
-        spin_lock_irqsave (&req->rq_lock, flags);
+        __u32 opc = lustre_msg_get_opc(req->rq_reqmsg);
+        int err;
 
-        if (req->rq_replied) {
-                DEBUG_REQ(D_NET, req, "REPLIED:");
-                GOTO(out, rc = 1);
-        }
-        
-        if (req->rq_net_err && !req->rq_timedout) {
-                spin_unlock_irqrestore (&req->rq_lock, flags);
-                rc = ptlrpc_expire_one_request(req); 
-                spin_lock_irqsave (&req->rq_lock, flags);
-                GOTO(out, rc);
-        }
+        /* Suppress particular reconnect errors which are to be expected.  No
+         * errors are suppressed for the initial connection on an import */
+        if ((lustre_handle_is_used(&req->rq_import->imp_remote_handle)) &&
+            (opc == OST_CONNECT || opc == MDS_CONNECT || opc == MGS_CONNECT)) {
 
-        if (req->rq_err) {
-                DEBUG_REQ(D_ERROR, req, "ABORTED:");
-                GOTO(out, rc = 1);
-        }
+                /* Suppress timed out reconnect requests */
+                if (req->rq_timedout)
+                        return 0;
 
-        if (req->rq_resend) {
-                DEBUG_REQ(D_ERROR, req, "RESEND:");
-                GOTO(out, rc = 1);
+                /* Suppress unavailable/again reconnect requests */
+                err = lustre_msg_get_status(req->rq_repmsg);
+                if (err == -ENODEV || err == -EAGAIN)
+                        return 0;
         }
 
-        if (req->rq_restart) {
-                DEBUG_REQ(D_ERROR, req, "RESTART:");
-                GOTO(out, rc = 1);
-        }
-        EXIT;
- out:
-        spin_unlock_irqrestore (&req->rq_lock, flags);
-        DEBUG_REQ(D_NET, req, "rc = %d for", rc);
-        return rc;
+        return 1;
 }
 
 static int ptlrpc_check_status(struct ptlrpc_request *req)
@@ -460,10 +951,14 @@ static int ptlrpc_check_status(struct ptlrpc_request *req)
         int err;
         ENTRY;
 
-        err = req->rq_repmsg->status;
-        if (req->rq_repmsg->type == PTL_RPC_MSG_ERR) {
-                DEBUG_REQ(D_ERROR, req, "type == PTL_RPC_MSG_ERR, err == %d", 
-                          err);
+        err = lustre_msg_get_status(req->rq_repmsg);
+        if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR) {
+                struct obd_import *imp = req->rq_import;
+                __u32 opc = lustre_msg_get_opc(req->rq_reqmsg);
+                LCONSOLE_ERROR_MSG(0x011,"an error occurred while communicating"
+                                " with %s. The %s operation failed with %d\n",
+                                libcfs_nid2str(imp->imp_connection->c_peer.nid),
+                                ll_opcode2str(opc), err);
                 RETURN(err < 0 ? err : -EINVAL);
         }
 
@@ -474,91 +969,182 @@ static int ptlrpc_check_status(struct ptlrpc_request *req)
                 DEBUG_REQ(D_INFO, req, "status is %d", err);
         }
 
+        if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR) {
+                struct obd_import *imp = req->rq_import;
+                __u32 opc = lustre_msg_get_opc(req->rq_reqmsg);
+
+                if (ptlrpc_console_allow(req))
+                        LCONSOLE_ERROR_MSG(0x011,"an error occurred while "
+                                           "communicating with %s. The %s "
+                                           "operation failed with %d\n",
+                                           libcfs_nid2str(
+                                           imp->imp_connection->c_peer.nid),
+                                           ll_opcode2str(opc), err);
+
+                RETURN(err < 0 ? err : -EINVAL);
+        }
+
         RETURN(err);
 }
 
+/**
+ * save pre-versions for replay
+ */
+static void ptlrpc_save_versions(struct ptlrpc_request *req)
+{
+        struct lustre_msg *repmsg = req->rq_repmsg;
+        struct lustre_msg *reqmsg = req->rq_reqmsg;
+        __u64 *versions = lustre_msg_get_versions(repmsg);
+        ENTRY;
+
+        if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
+                return;
+
+        LASSERT(versions);
+        lustre_msg_set_versions(reqmsg, versions);
+        CDEBUG(D_INFO, "Client save versions ["LPX64"/"LPX64"]\n",
+               versions[0], versions[1]);
+
+        EXIT;
+}
+
+/**
+ * Callback function called when client receives RPC reply for \a req.
+ */
 static int after_reply(struct ptlrpc_request *req)
 {
-        unsigned long flags;
         struct obd_import *imp = req->rq_import;
+        struct obd_device *obd = req->rq_import->imp_obd;
         int rc;
+        struct timeval work_start;
+        long timediff;
         ENTRY;
 
-        LASSERT(!req->rq_receiving_reply);
+        LASSERT(obd != NULL);
+        /* repbuf must be unlinked */
+        LASSERT(!req->rq_receiving_reply && !req->rq_must_unlink);
 
-        /* NB Until this point, the whole of the incoming message,
-         * including buflens, status etc is in the sender's byte order. */
+        if (req->rq_reply_truncate) {
+                if (ptlrpc_no_resend(req)) {
+                        DEBUG_REQ(D_ERROR, req, "reply buffer overflow,"
+                                  " expected: %d, actual size: %d",
+                                  req->rq_nob_received, req->rq_repbuf_len);
+                        RETURN(-EOVERFLOW);
+                }
 
-#if SWAB_PARANOIA
-        /* Clear reply swab mask; this is a new reply in sender's byte order */
-        req->rq_rep_swab_mask = 0;
-#endif
-        LASSERT (req->rq_nob_received <= req->rq_repbuf_len);
-        rc = ptlrpcs_cli_unwrap_reply(req);
-        if (rc) {
-                CERROR("verify reply error: %d\n", rc);
-                RETURN(rc);
-        }
-        /* unwrap_reply may request rpc be resend */
-        if (req->rq_ptlrpcs_restart) {
-                req->rq_resend = 1;
+                sptlrpc_cli_free_repbuf(req);
+                /* Pass the required reply buffer size (include
+                 * space for early reply).
+                 * NB: no need to roundup because alloc_repbuf
+                 * will roundup it */
+                req->rq_replen       = req->rq_nob_received;
+                req->rq_nob_received = 0;
+                req->rq_resend       = 1;
                 RETURN(0);
         }
 
-        /* unwrap_reply will set rq_replen as the actual received
-         * lustre_msg length
+        /*
+         * NB Until this point, the whole of the incoming message,
+         * including buflens, status etc is in the sender's byte order.
          */
-        rc = lustre_unpack_msg(req->rq_repmsg, req->rq_replen);
+        rc = sptlrpc_cli_unwrap_reply(req);
         if (rc) {
-                CERROR("unpack_rep failed: %d\n", rc);
-                RETURN(-EPROTO);
+                DEBUG_REQ(D_ERROR, req, "unwrap reply failed (%d):", rc);
+                RETURN(rc);
+        }
+
+        /*
+         * Security layer unwrap might ask resend this request.
+         */
+        if (req->rq_resend)
+                RETURN(0);
+
+        rc = unpack_reply(req);
+        if (rc)
+                RETURN(rc);
+
+        cfs_gettimeofday(&work_start);
+        timediff = cfs_timeval_sub(&work_start, &req->rq_arrival_time, NULL);
+        if (obd->obd_svc_stats != NULL) {
+                lprocfs_counter_add(obd->obd_svc_stats, PTLRPC_REQWAIT_CNTR,
+                                    timediff);
+                ptlrpc_lprocfs_rpc_sent(req, timediff);
         }
 
-        if (req->rq_repmsg->type != PTL_RPC_MSG_REPLY &&
-            req->rq_repmsg->type != PTL_RPC_MSG_ERR) {
-                CERROR("invalid packet type received (type=%u)\n",
-                       req->rq_repmsg->type);
+        if (lustre_msg_get_type(req->rq_repmsg) != PTL_RPC_MSG_REPLY &&
+            lustre_msg_get_type(req->rq_repmsg) != PTL_RPC_MSG_ERR) {
+                DEBUG_REQ(D_ERROR, req, "invalid packet received (type=%u)",
+                          lustre_msg_get_type(req->rq_repmsg));
                 RETURN(-EPROTO);
         }
 
+        if (lustre_msg_get_opc(req->rq_reqmsg) != OBD_PING)
+                OBD_FAIL_TIMEOUT(OBD_FAIL_PTLRPC_PAUSE_REP, obd_fail_val);
+        ptlrpc_at_adj_service(req, lustre_msg_get_timeout(req->rq_repmsg));
+        ptlrpc_at_adj_net_latency(req,
+                                  lustre_msg_get_service_time(req->rq_repmsg));
+
         rc = ptlrpc_check_status(req);
+        imp->imp_connect_error = rc;
 
-        /* Either we've been evicted, or the server has failed for
-         * some reason. Try to reconnect, and if that fails, punt to the
-         * upcall. */
-        if (rc == -ENOTCONN) {
-                if (req->rq_send_state != LUSTRE_IMP_FULL ||
-                    imp->imp_obd->obd_no_recov || imp->imp_dlm_fake) {
-                        RETURN(-ENOTCONN);
+        if (rc) {
+                /*
+                 * Either we've been evicted, or the server has failed for
+                 * some reason. Try to reconnect, and if that fails, punt to
+                 * the upcall.
+                 */
+                if (ll_rpc_recoverable_error(rc)) {
+                        if (req->rq_send_state != LUSTRE_IMP_FULL ||
+                            imp->imp_obd->obd_no_recov || imp->imp_dlm_fake) {
+                                RETURN(rc);
+                        }
+                        ptlrpc_request_handle_notconn(req);
+                        RETURN(rc);
                 }
-
-                ptlrpc_request_handle_notconn(req);
-
-                RETURN(rc);
+        } else {
+                /*
+                 * Let's look if server sent slv. Do it only for RPC with
+                 * rc == 0.
+                 */
+                ldlm_cli_update_pool(req);
         }
 
-        /* Store transno in reqmsg for replay. */
-        req->rq_reqmsg->transno = req->rq_transno = req->rq_repmsg->transno;
+        /*
+         * Store transno in reqmsg for replay.
+         */
+        if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)) {
+                req->rq_transno = lustre_msg_get_transno(req->rq_repmsg);
+                lustre_msg_set_transno(req->rq_reqmsg, req->rq_transno);
+        }
 
-        if (req->rq_import->imp_replayable) {
-                spin_lock_irqsave(&imp->imp_lock, flags);
-                if (req->rq_transno != 0)
+        if (imp->imp_replayable) {
+                cfs_spin_lock(&imp->imp_lock);
+                /*
+                 * No point in adding already-committed requests to the replay
+                 * list, we will just remove them immediately. b=9829
+                 */
+                if (req->rq_transno != 0 &&
+                    (req->rq_transno >
+                     lustre_msg_get_last_committed(req->rq_repmsg) ||
+                     req->rq_replay)) {
+                        /** version recovery */
+                        ptlrpc_save_versions(req);
                         ptlrpc_retain_replayable_request(req, imp);
-                else if (req->rq_commit_cb != NULL) {
-                        spin_unlock_irqrestore(&imp->imp_lock, flags);
+                else if (req->rq_commit_cb != NULL) {
+                        cfs_spin_unlock(&imp->imp_lock);
                         req->rq_commit_cb(req);
-                        spin_lock_irqsave(&imp->imp_lock, flags);
-               }
-
-                if (req->rq_transno > imp->imp_max_transno)
-                        imp->imp_max_transno = req->rq_transno;
+                        cfs_spin_lock(&imp->imp_lock);
+                }
 
-                /* Replay-enabled imports return commit-status information. */
-                if (req->rq_repmsg->last_committed)
+                /*
+                 * Replay-enabled imports return commit-status information.
+                 */
+                if (lustre_msg_get_last_committed(req->rq_repmsg)) {
                         imp->imp_peer_committed_transno =
-                                req->rq_repmsg->last_committed;
+                                lustre_msg_get_last_committed(req->rq_repmsg);
+                }
                 ptlrpc_free_committed(imp);
-                spin_unlock_irqrestore(&imp->imp_lock, flags);
+                cfs_spin_unlock(&imp->imp_lock);
         }
 
         RETURN(rc);
@@ -566,59 +1152,70 @@ static int after_reply(struct ptlrpc_request *req)
 
 static int ptlrpc_send_new_req(struct ptlrpc_request *req)
 {
-        char                   str[PTL_NALFMT_SIZE];
         struct obd_import     *imp;
-        unsigned long          flags;
         int rc;
         ENTRY;
 
         LASSERT(req->rq_phase == RQ_PHASE_NEW);
-        req->rq_phase = RQ_PHASE_RPC;
+        if (req->rq_sent && (req->rq_sent > cfs_time_current_sec()))
+                RETURN (0);
+
+        ptlrpc_rqphase_move(req, RQ_PHASE_RPC);
 
         imp = req->rq_import;
-        spin_lock_irqsave(&imp->imp_lock, flags);
+        cfs_spin_lock(&imp->imp_lock);
 
         req->rq_import_generation = imp->imp_generation;
 
         if (ptlrpc_import_delay_req(imp, req, &rc)) {
-                spin_lock (&req->rq_lock);
+                cfs_spin_lock(&req->rq_lock);
                 req->rq_waiting = 1;
-                spin_unlock (&req->rq_lock);
+                cfs_spin_unlock(&req->rq_lock);
 
                 DEBUG_REQ(D_HA, req, "req from PID %d waiting for recovery: "
-                          "(%s != %s)",
-                          req->rq_reqmsg->status, 
+                          "(%s != %s)", lustre_msg_get_status(req->rq_reqmsg),
                           ptlrpc_import_state_name(req->rq_send_state),
                           ptlrpc_import_state_name(imp->imp_state));
-                LASSERT(list_empty (&req->rq_list));
-
-                list_add_tail(&req->rq_list, &imp->imp_delayed_list);
-                spin_unlock_irqrestore(&imp->imp_lock, flags);
+                LASSERT(cfs_list_empty(&req->rq_list));
+                cfs_list_add_tail(&req->rq_list, &imp->imp_delayed_list);
+                cfs_atomic_inc(&req->rq_import->imp_inflight);
+                cfs_spin_unlock(&imp->imp_lock);
                 RETURN(0);
         }
 
         if (rc != 0) {
-                spin_unlock_irqrestore(&imp->imp_lock, flags);
+                cfs_spin_unlock(&imp->imp_lock);
                 req->rq_status = rc;
-                req->rq_phase = RQ_PHASE_INTERPRET;
+                ptlrpc_rqphase_move(req, RQ_PHASE_INTERPRET);
                 RETURN(rc);
         }
 
-        /* XXX this is the same as ptlrpc_queue_wait */
-        LASSERT(list_empty(&req->rq_list));
-        list_add_tail(&req->rq_list, &imp->imp_sending_list);
-        spin_unlock_irqrestore(&imp->imp_lock, flags);
+        LASSERT(cfs_list_empty(&req->rq_list));
+        cfs_list_add_tail(&req->rq_list, &imp->imp_sending_list);
+        cfs_atomic_inc(&req->rq_import->imp_inflight);
+        cfs_spin_unlock(&imp->imp_lock);
 
-        req->rq_reqmsg->status = current->pid;
-        CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:ni:nid:opc"
-               " %s:%s:%d:"LPU64":%s:%s:%d\n", current->comm,
-               imp->imp_obd->obd_uuid.uuid, req->rq_reqmsg->status,
-               req->rq_xid,
-               imp->imp_connection->c_peer.peer_ni->pni_name,
-               ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
-               req->rq_reqmsg->opc);
+        lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
 
-        rc = ptl_send_rpc(req);
+        rc = sptlrpc_req_refresh_ctx(req, -1);
+        if (rc) {
+                if (req->rq_err) {
+                        req->rq_status = rc;
+                        RETURN(1);
+                } else {
+                        req->rq_wait_ctx = 1;
+                        RETURN(0);
+                }
+        }
+
+        CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:nid:opc"
+               " %s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
+               imp->imp_obd->obd_uuid.uuid,
+               lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
+               libcfs_nid2str(imp->imp_connection->c_peer.nid),
+               lustre_msg_get_opc(req->rq_reqmsg));
+
+        rc = ptl_send_rpc(req, 0);
         if (rc) {
                 DEBUG_REQ(D_HA, req, "send failed (%d); expect timeout", rc);
                 req->rq_net_err = 1;
@@ -627,21 +1224,22 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
         RETURN(0);
 }
 
-int ptlrpc_check_set(struct ptlrpc_request_set *set)
+/* this sends any unsent RPCs in @set and returns TRUE if all are sent */
+int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
 {
-        char str[PTL_NALFMT_SIZE];
-        unsigned long flags;
-        struct list_head *tmp;
+        cfs_list_t *tmp;
         int force_timer_recalc = 0;
         ENTRY;
 
-        if (set->set_remaining == 0)
+        if (cfs_atomic_read(&set->set_remaining) == 0)
                 RETURN(1);
 
-        list_for_each(tmp, &set->set_requests) {
+        cfs_list_for_each(tmp, &set->set_requests) {
                 struct ptlrpc_request *req =
-                        list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+                        cfs_list_entry(tmp, struct ptlrpc_request,
+                                       rq_set_chain);
                 struct obd_import *imp = req->rq_import;
+                int unregistered = 0;
                 int rc = 0;
 
                 if (req->rq_phase == RQ_PHASE_NEW &&
@@ -649,100 +1247,159 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set)
                         force_timer_recalc = 1;
                 }
 
+                /* delayed send - skip */
+                if (req->rq_phase == RQ_PHASE_NEW && req->rq_sent)
+                        continue;
+
                 if (!(req->rq_phase == RQ_PHASE_RPC ||
                       req->rq_phase == RQ_PHASE_BULK ||
                       req->rq_phase == RQ_PHASE_INTERPRET ||
+                      req->rq_phase == RQ_PHASE_UNREGISTERING ||
                       req->rq_phase == RQ_PHASE_COMPLETE)) {
                         DEBUG_REQ(D_ERROR, req, "bad phase %x", req->rq_phase);
                         LBUG();
                 }
 
+                if (req->rq_phase == RQ_PHASE_UNREGISTERING) {
+                        LASSERT(req->rq_next_phase != req->rq_phase);
+                        LASSERT(req->rq_next_phase != RQ_PHASE_UNDEFINED);
+
+                        /*
+                         * Skip processing until reply is unlinked. We
+                         * can't return to pool before that and we can't
+                         * call interpret before that. We need to make
+                         * sure that all rdma transfers finished and will
+                         * not corrupt any data.
+                         */
+                        if (ptlrpc_client_recv_or_unlink(req) ||
+                            ptlrpc_client_bulk_active(req))
+                                continue;
+
+                        /*
+                         * Turn fail_loc off to prevent it from looping
+                         * forever.
+                         */
+                        if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_LONG_REPL_UNLINK)) {
+                                OBD_FAIL_CHECK_ORSET(OBD_FAIL_PTLRPC_LONG_REPL_UNLINK,
+                                                     OBD_FAIL_ONCE);
+                        }
+                        if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_LONG_BULK_UNLINK)) {
+                                OBD_FAIL_CHECK_ORSET(OBD_FAIL_PTLRPC_LONG_BULK_UNLINK,
+                                                     OBD_FAIL_ONCE);
+                        }
+
+                        /*
+                         * Move to next phase if reply was successfully
+                         * unlinked.
+                         */
+                        ptlrpc_rqphase_move(req, req->rq_next_phase);
+                }
+
                 if (req->rq_phase == RQ_PHASE_COMPLETE)
                         continue;
 
                 if (req->rq_phase == RQ_PHASE_INTERPRET)
                         GOTO(interpret, req->rq_status);
 
-                if (req->rq_net_err && !req->rq_timedout)
-                        ptlrpc_expire_one_request(req); 
-
-                if (req->rq_err || req->rq_ptlrpcs_err) {
-                        ptlrpc_unregister_reply(req);
-                        if (req->rq_status == 0)
-                                req->rq_status = req->rq_err ? -EIO : -EPERM;
-                        req->rq_phase = RQ_PHASE_INTERPRET;
+                /*
+                 * Note that this also will start async reply unlink.
+                 */
+                if (req->rq_net_err && !req->rq_timedout) {
+                        ptlrpc_expire_one_request(req, 1);
 
-                        spin_lock_irqsave(&imp->imp_lock, flags);
-                        list_del_init(&req->rq_list);
-                        spin_unlock_irqrestore(&imp->imp_lock, flags);
+                        /*
+                         * Check if we still need to wait for unlink.
+                         */
+                        if (ptlrpc_client_recv_or_unlink(req) ||
+                            ptlrpc_client_bulk_active(req))
+                                continue;
+                }
 
+                if (req->rq_err) {
+                        cfs_spin_lock(&req->rq_lock);
+                        req->rq_replied = 0;
+                        cfs_spin_unlock(&req->rq_lock);
+                        if (req->rq_status == 0)
+                                req->rq_status = -EIO;
+                        ptlrpc_rqphase_move(req, RQ_PHASE_INTERPRET);
                         GOTO(interpret, req->rq_status);
                 }
 
-                /* ptlrpc_queue_wait->l_wait_event guarantees that rq_intr
-                 * will only be set after rq_timedout, but the oig waiting
-                 * path sets rq_intr irrespective of whether ptlrpcd has
-                 * seen a timeout.  our policy is to only interpret 
-                 * interrupted rpcs after they have timed out */
-                if (req->rq_intr && (req->rq_timedout || req->rq_waiting)) {
-                        /* NB could be on delayed list */
-                        ptlrpc_unregister_reply(req);
-                        req->rq_status = -EINTR;
-                        req->rq_phase = RQ_PHASE_INTERPRET;
-
-                        spin_lock_irqsave(&imp->imp_lock, flags);
-                        list_del_init(&req->rq_list);
-                        spin_unlock_irqrestore(&imp->imp_lock, flags);
+                /* ptlrpc_set_wait->l_wait_event sets lwi_allow_intr
+                 * so it sets rq_intr regardless of individual rpc
+                 * timeouts. The synchronous IO waiting path sets 
+                 * rq_intr irrespective of whether ptlrpcd
+                 * has seen a timeout.  Our policy is to only interpret
+                 * interrupted rpcs after they have timed out, so we
+                 * need to enforce that here.
+                 */
 
+                if (req->rq_intr && (req->rq_timedout || req->rq_waiting ||
+                                     req->rq_wait_ctx)) {
+                        req->rq_status = -EINTR;
+                        ptlrpc_rqphase_move(req, RQ_PHASE_INTERPRET);
                         GOTO(interpret, req->rq_status);
                 }
 
                 if (req->rq_phase == RQ_PHASE_RPC) {
-                        if (req->rq_timedout||req->rq_waiting||req->rq_resend) {
+                        if (req->rq_timedout || req->rq_resend ||
+                            req->rq_waiting || req->rq_wait_ctx) {
                                 int status;
 
-                                ptlrpc_unregister_reply(req);
-
-                                spin_lock_irqsave(&imp->imp_lock, flags);
+                                if (!ptlrpc_unregister_reply(req, 1))
+                                        continue;
 
+                                cfs_spin_lock(&imp->imp_lock);
                                 if (ptlrpc_import_delay_req(imp, req, &status)){
-                                        spin_unlock_irqrestore(&imp->imp_lock,
-                                                               flags);
+                                        /* put on delay list - only if we wait
+                                         * recovery finished - before send */
+                                        cfs_list_del_init(&req->rq_list);
+                                        cfs_list_add_tail(&req->rq_list,
+                                                          &imp-> \
+                                                          imp_delayed_list);
+                                        cfs_spin_unlock(&imp->imp_lock);
                                         continue;
                                 }
 
-                                list_del_init(&req->rq_list);
                                 if (status != 0)  {
                                         req->rq_status = status;
-                                        req->rq_phase = RQ_PHASE_INTERPRET;
-                                        spin_unlock_irqrestore(&imp->imp_lock,
-                                                               flags);
+                                        ptlrpc_rqphase_move(req,
+                                                RQ_PHASE_INTERPRET);
+                                        cfs_spin_unlock(&imp->imp_lock);
                                         GOTO(interpret, req->rq_status);
                                 }
-                                if (req->rq_no_resend) {
+                                if (ptlrpc_no_resend(req) && !req->rq_wait_ctx) {
                                         req->rq_status = -ENOTCONN;
-                                        req->rq_phase = RQ_PHASE_INTERPRET;
-                                        spin_unlock_irqrestore(&imp->imp_lock,
-                                                               flags);
+                                        ptlrpc_rqphase_move(req,
+                                                RQ_PHASE_INTERPRET);
+                                        cfs_spin_unlock(&imp->imp_lock);
                                         GOTO(interpret, req->rq_status);
                                 }
-                                list_add_tail(&req->rq_list,
+
+                                cfs_list_del_init(&req->rq_list);
+                                cfs_list_add_tail(&req->rq_list,
                                               &imp->imp_sending_list);
 
-                                spin_unlock_irqrestore(&imp->imp_lock, flags);
+                                cfs_spin_unlock(&imp->imp_lock);
 
+                                cfs_spin_lock(&req->rq_lock);
                                 req->rq_waiting = 0;
-                                if (req->rq_resend) {
-                                        if (!req->rq_ptlrpcs_restart)
-                                                lustre_msg_add_flags(
-                                                        req->rq_reqmsg,
-                                                        MSG_RESENT);
+                                cfs_spin_unlock(&req->rq_lock);
+
+                                if (req->rq_timedout || req->rq_resend) {
+                                        /* This is re-sending anyways,
+                                         * let's mark req as resend. */
+                                        cfs_spin_lock(&req->rq_lock);
+                                        req->rq_resend = 1;
+                                        cfs_spin_unlock(&req->rq_lock);
                                         if (req->rq_bulk) {
-                                                __u64 old_xid = req->rq_xid;
+                                                __u64 old_xid;
 
-                                                ptlrpc_unregister_bulk (req);
+                                                if (!ptlrpc_unregister_bulk(req, 1))
+                                                        continue;
 
                                                 /* ensure previous bulk fails */
+                                                old_xid = req->rq_xid;
                                                 req->rq_xid = ptlrpc_next_xid();
                                                 CDEBUG(D_HA, "resend bulk "
                                                        "old x"LPU64
@@ -750,242 +1407,334 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set)
                                                        old_xid, req->rq_xid);
                                         }
                                 }
+                                /*
+                                 * rq_wait_ctx is only touched by ptlrpcd,
+                                 * so no lock is needed here.
+                                 */
+                                status = sptlrpc_req_refresh_ctx(req, -1);
+                                if (status) {
+                                        if (req->rq_err) {
+                                                req->rq_status = status;
+                                                cfs_spin_lock(&req->rq_lock);
+                                                req->rq_wait_ctx = 0;
+                                                cfs_spin_unlock(&req->rq_lock);
+                                                force_timer_recalc = 1;
+                                        } else {
+                                                cfs_spin_lock(&req->rq_lock);
+                                                req->rq_wait_ctx = 1;
+                                                cfs_spin_unlock(&req->rq_lock);
+                                        }
+
+                                        continue;
+                                } else {
+                                        cfs_spin_lock(&req->rq_lock);
+                                        req->rq_wait_ctx = 0;
+                                        cfs_spin_unlock(&req->rq_lock);
+                                }
 
-                                rc = ptl_send_rpc(req);
+                                rc = ptl_send_rpc(req, 0);
                                 if (rc) {
                                         DEBUG_REQ(D_HA, req, "send failed (%d)",
                                                   rc);
                                         force_timer_recalc = 1;
+                                        cfs_spin_lock(&req->rq_lock);
                                         req->rq_net_err = 1;
+                                        cfs_spin_unlock(&req->rq_lock);
                                 }
                                 /* need to reset the timeout */
                                 force_timer_recalc = 1;
                         }
 
+                        cfs_spin_lock(&req->rq_lock);
+
+                        if (ptlrpc_client_early(req)) {
+                                ptlrpc_at_recv_early_reply(req);
+                                cfs_spin_unlock(&req->rq_lock);
+                                continue;
+                        }
+
                         /* Still waiting for a reply? */
-                        if (ptlrpc_client_receiving_reply(req))
+                        if (ptlrpc_client_recv(req)) {
+                                cfs_spin_unlock(&req->rq_lock);
                                 continue;
+                        }
 
                         /* Did we actually receive a reply? */
-                        if (!ptlrpc_client_replied(req))
+                        if (!ptlrpc_client_replied(req)) {
+                                cfs_spin_unlock(&req->rq_lock);
                                 continue;
+                        }
+
+                        cfs_spin_unlock(&req->rq_lock);
 
-                        spin_lock_irqsave(&imp->imp_lock, flags);
-                        list_del_init(&req->rq_list);
-                        spin_unlock_irqrestore(&imp->imp_lock, flags);
+                        /* unlink from net because we are going to
+                         * swab in-place of reply buffer */
+                        unregistered = ptlrpc_unregister_reply(req, 1);
+                        if (!unregistered)
+                                continue;
 
                         req->rq_status = after_reply(req);
-                        if (req->rq_resend) {
-                                /* Add this req to the delayed list so
-                                   it can be errored if the import is
-                                   evicted after recovery. */
-                                spin_lock_irqsave (&req->rq_lock, flags);
-                                list_add_tail(&req->rq_list, 
-                                              &imp->imp_delayed_list);
-                                spin_unlock_irqrestore(&req->rq_lock, flags);
+                        if (req->rq_resend)
                                 continue;
-                        }
 
                         /* If there is no bulk associated with this request,
                          * then we're done and should let the interpreter
-                         * process the reply.  Similarly if the RPC returned
+                         * process the reply. Similarly if the RPC returned
                          * an error, and therefore the bulk will never arrive.
                          */
                         if (req->rq_bulk == NULL || req->rq_status != 0) {
-                                req->rq_phase = RQ_PHASE_INTERPRET;
+                                ptlrpc_rqphase_move(req, RQ_PHASE_INTERPRET);
                                 GOTO(interpret, req->rq_status);
                         }
 
-                        req->rq_phase = RQ_PHASE_BULK;
+                        ptlrpc_rqphase_move(req, RQ_PHASE_BULK);
                 }
 
                 LASSERT(req->rq_phase == RQ_PHASE_BULK);
-                if (ptlrpc_bulk_active(req->rq_bulk))
+                if (ptlrpc_client_bulk_active(req))
                         continue;
 
                 if (!req->rq_bulk->bd_success) {
                         /* The RPC reply arrived OK, but the bulk screwed
-                         * up!  Dead wierd since the server told us the RPC
+                         * up!  Dead weird since the server told us the RPC
                          * was good after getting the REPLY for her GET or
                          * the ACK for her PUT. */
                         DEBUG_REQ(D_ERROR, req, "bulk transfer failed");
                         LBUG();
                 }
 
-                req->rq_phase = RQ_PHASE_INTERPRET;
+                ptlrpc_rqphase_move(req, RQ_PHASE_INTERPRET);
 
         interpret:
                 LASSERT(req->rq_phase == RQ_PHASE_INTERPRET);
-                LASSERT(!req->rq_receiving_reply);
 
-                ptlrpc_unregister_reply(req);
-                if (req->rq_bulk != NULL)
-                        ptlrpc_unregister_bulk (req);
+                /* This moves to "unregistering" phase we need to wait for
+                 * reply unlink. */
+                if (!unregistered && !ptlrpc_unregister_reply(req, 1))
+                        continue;
 
-                req->rq_phase = RQ_PHASE_COMPLETE;
+                if (!ptlrpc_unregister_bulk(req, 1))
+                        continue;
 
-                if (req->rq_interpret_reply != NULL) {
-                        int (*interpreter)(struct ptlrpc_request *,void *,int) =
-                                req->rq_interpret_reply;
-                        req->rq_status = interpreter(req, &req->rq_async_args,
-                                                     req->rq_status);
-                }
+                /* When calling interpret receiving already should be
+                 * finished. */
+                LASSERT(!req->rq_receiving_reply);
 
-                CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:ni:nid:"
-                       "opc %s:%s:%d:"LPU64":%s:%s:%d\n", current->comm,
-                       imp->imp_obd->obd_uuid.uuid, req->rq_reqmsg->status,
-                       req->rq_xid,
-                       imp->imp_connection->c_peer.peer_ni->pni_name,
-                       ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
-                       req->rq_reqmsg->opc);
+                ptlrpc_req_interpret(env, req, req->rq_status);
 
-                set->set_remaining--;
+                ptlrpc_rqphase_move(req, RQ_PHASE_COMPLETE);
+
+                CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:nid:"
+                       "opc %s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
+                       imp->imp_obd->obd_uuid.uuid,
+                       req->rq_reqmsg ? lustre_msg_get_status(req->rq_reqmsg):-1,
+                       req->rq_xid,
+                       libcfs_nid2str(imp->imp_connection->c_peer.nid),
+                       req->rq_reqmsg ? lustre_msg_get_opc(req->rq_reqmsg) : -1);
+
+                cfs_spin_lock(&imp->imp_lock);
+                /* Request already may be not on sending or delaying list. This
+                 * may happen in the case of marking it erroneous for the case
+                 * ptlrpc_import_delay_req(req, status) find it impossible to
+                 * allow sending this rpc and returns *status != 0. */
+                if (!cfs_list_empty(&req->rq_list)) {
+                        cfs_list_del_init(&req->rq_list);
+                        cfs_atomic_dec(&imp->imp_inflight);
+                }
+                cfs_spin_unlock(&imp->imp_lock);
 
-                atomic_dec(&imp->imp_inflight);
-                wake_up(&imp->imp_recovery_waitq);
+                cfs_atomic_dec(&set->set_remaining);
+                cfs_waitq_broadcast(&imp->imp_recovery_waitq);
         }
 
         /* If we hit an error, we want to recover promptly. */
-        RETURN(set->set_remaining == 0 || force_timer_recalc);
+        RETURN(cfs_atomic_read(&set->set_remaining) == 0 || force_timer_recalc);
 }
 
-int ptlrpc_expire_one_request(struct ptlrpc_request *req)
+/* Return 1 if we should give up, else 0 */
+int ptlrpc_expire_one_request(struct ptlrpc_request *req, int async_unlink)
 {
-        unsigned long      flags;
         struct obd_import *imp = req->rq_import;
-        int replied = 0;
+        int rc = 0;
         ENTRY;
 
-        DEBUG_REQ(D_ERROR, req, "timeout (sent at %lu, %lus ago)",
-                  (long)req->rq_sent, LTIME_S(CURRENT_TIME) - req->rq_sent);
+        cfs_spin_lock(&req->rq_lock);
+        req->rq_timedout = 1;
+        cfs_spin_unlock(&req->rq_lock);
 
-        spin_lock_irqsave (&req->rq_lock, flags);
-        replied = req->rq_replied;
-        if (!replied)
-                req->rq_timedout = 1;
-        spin_unlock_irqrestore (&req->rq_lock, flags);
+        DEBUG_REQ(req->rq_fake ? D_INFO : D_WARNING, req, 
+                  "Request x"LPU64" sent from %s to NID %s "CFS_DURATION_T"s "
+                  "ago has %s ("CFS_DURATION_T"s prior to deadline).\n",
+                  req->rq_xid, imp ? imp->imp_obd->obd_name : "<?>",
+                  imp ? libcfs_nid2str(imp->imp_connection->c_peer.nid) : "<?>",
+                  cfs_time_sub(cfs_time_current_sec(), req->rq_sent),
+                  req->rq_net_err ? "failed due to network error" : "timed out",
+                  cfs_time_sub(req->rq_deadline, req->rq_sent));
 
-        if (replied)
-                RETURN(0);
+        if (imp != NULL && obd_debug_peer_on_timeout)
+                LNetCtl(IOC_LIBCFS_DEBUG_PEER, &imp->imp_connection->c_peer);
 
-        ptlrpc_unregister_reply (req);
+        ptlrpc_unregister_reply(req, async_unlink);
+        ptlrpc_unregister_bulk(req, async_unlink);
 
         if (obd_dump_on_timeout)
-                portals_debug_dumplog();
-
-        if (req->rq_bulk != NULL)
-                ptlrpc_unregister_bulk (req);
+                libcfs_debug_dumplog();
 
         if (imp == NULL) {
                 DEBUG_REQ(D_HA, req, "NULL import: already cleaned up?");
                 RETURN(1);
         }
 
+        if (req->rq_fake)
+               RETURN(1);
+
+        cfs_atomic_inc(&imp->imp_timeouts);
+
         /* The DLM server doesn't want recovery run on its imports. */
         if (imp->imp_dlm_fake)
                 RETURN(1);
 
         /* If this request is for recovery or other primordial tasks,
          * then error it out here. */
-        if (req->rq_send_state != LUSTRE_IMP_FULL ||
+        if (req->rq_ctx_init || req->rq_ctx_fini ||
+            req->rq_send_state != LUSTRE_IMP_FULL ||
             imp->imp_obd->obd_no_recov) {
-                spin_lock_irqsave (&req->rq_lock, flags);
+                DEBUG_REQ(D_RPCTRACE, req, "err -110, sent_state=%s (now=%s)",
+                          ptlrpc_import_state_name(req->rq_send_state),
+                          ptlrpc_import_state_name(imp->imp_state));
+                cfs_spin_lock(&req->rq_lock);
                 req->rq_status = -ETIMEDOUT;
                 req->rq_err = 1;
-                spin_unlock_irqrestore (&req->rq_lock, flags);
+                cfs_spin_unlock(&req->rq_lock);
                 RETURN(1);
         }
 
-        ptlrpc_fail_import(imp, req->rq_import_generation);
+        /* if a request can't be resent we can't wait for an answer after
+           the timeout */
+        if (ptlrpc_no_resend(req)) {
+                DEBUG_REQ(D_RPCTRACE, req, "TIMEOUT-NORESEND:");
+                rc = 1;
+        }
 
-        RETURN(0);
+        ptlrpc_fail_import(imp, lustre_msg_get_conn_cnt(req->rq_reqmsg));
+
+        RETURN(rc);
 }
 
 int ptlrpc_expired_set(void *data)
 {
         struct ptlrpc_request_set *set = data;
-        struct list_head          *tmp;
-        time_t                     now = LTIME_S(CURRENT_TIME);
+        cfs_list_t                *tmp;
+        time_t                     now = cfs_time_current_sec();
         ENTRY;
 
         LASSERT(set != NULL);
 
-        /* A timeout expired; see which reqs it applies to... */
-        list_for_each (tmp, &set->set_requests) {
+        /*
+         * A timeout expired. See which reqs it applies to...
+         */
+        cfs_list_for_each (tmp, &set->set_requests) {
                 struct ptlrpc_request *req =
-                        list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+                        cfs_list_entry(tmp, struct ptlrpc_request,
+                                       rq_set_chain);
+
+                /* don't expire request waiting for context */
+                if (req->rq_wait_ctx)
+                        continue;
 
-                /* request in-flight? */
-                if (!((req->rq_phase == RQ_PHASE_RPC && !req->rq_waiting 
-                       && !req->rq_resend) ||
+                /* Request in-flight? */
+                if (!((req->rq_phase == RQ_PHASE_RPC &&
+                       !req->rq_waiting && !req->rq_resend) ||
                       (req->rq_phase == RQ_PHASE_BULK)))
                         continue;
 
-                if (req->rq_timedout ||           /* already dealt with */
-                    req->rq_sent + req->rq_timeout > now) /* not expired */
+                if (req->rq_timedout ||     /* already dealt with */
+                    req->rq_deadline > now) /* not expired */
                         continue;
 
-                /* deal with this guy */
-                ptlrpc_expire_one_request (req);
+                /* Deal with this guy. Do it asynchronously to not block
+                 * ptlrpcd thread. */
+                ptlrpc_expire_one_request(req, 1);
         }
 
-        /* When waiting for a whole set, we always to break out of the
+        /*
+         * When waiting for a whole set, we always break out of the
          * sleep so we can recalculate the timeout, or enable interrupts
-         * iff everyone's timed out.
+         * if everyone's timed out.
          */
         RETURN(1);
 }
 
 void ptlrpc_mark_interrupted(struct ptlrpc_request *req)
 {
-        unsigned long flags;
-        spin_lock_irqsave(&req->rq_lock, flags);
+        cfs_spin_lock(&req->rq_lock);
         req->rq_intr = 1;
-        spin_unlock_irqrestore(&req->rq_lock, flags);
+        cfs_spin_unlock(&req->rq_lock);
 }
 
 void ptlrpc_interrupted_set(void *data)
 {
         struct ptlrpc_request_set *set = data;
-        struct list_head *tmp;
+        cfs_list_t *tmp;
 
         LASSERT(set != NULL);
         CERROR("INTERRUPTED SET %p\n", set);
 
-        list_for_each(tmp, &set->set_requests) {
+        cfs_list_for_each(tmp, &set->set_requests) {
                 struct ptlrpc_request *req =
-                        list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+                        cfs_list_entry(tmp, struct ptlrpc_request,
+                                       rq_set_chain);
 
-                if (req->rq_phase != RQ_PHASE_RPC)
+                if (req->rq_phase != RQ_PHASE_RPC &&
+                    req->rq_phase != RQ_PHASE_UNREGISTERING)
                         continue;
 
                 ptlrpc_mark_interrupted(req);
         }
 }
 
+/**
+ * Get the smallest timeout in the set; this does NOT set a timeout.
+ */
 int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set)
 {
-        struct list_head      *tmp;
-        time_t                 now = LTIME_S(CURRENT_TIME);
-        time_t                 deadline;
+        cfs_list_t            *tmp;
+        time_t                 now = cfs_time_current_sec();
         int                    timeout = 0;
         struct ptlrpc_request *req;
+        int                    deadline;
         ENTRY;
 
         SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */
 
-        list_for_each(tmp, &set->set_requests) {
-                req = list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+        cfs_list_for_each(tmp, &set->set_requests) {
+                req = cfs_list_entry(tmp, struct ptlrpc_request, rq_set_chain);
 
-                /* request in-flight? */
-                if (!((req->rq_phase == RQ_PHASE_RPC && !req->rq_waiting) ||
-                      (req->rq_phase == RQ_PHASE_BULK)))
+                /*
+                 * Request in-flight?
+                 */
+                if (!(((req->rq_phase == RQ_PHASE_RPC) && !req->rq_waiting) ||
+                      (req->rq_phase == RQ_PHASE_BULK) ||
+                      (req->rq_phase == RQ_PHASE_NEW)))
                         continue;
 
-                if (req->rq_timedout)   /* already timed out */
+                /*
+                 * Already timed out.
+                 */
+                if (req->rq_timedout)
+                        continue;
+
+                /*
+                 * Waiting for ctx.
+                 */
+                if (req->rq_wait_ctx)
                         continue;
 
-                deadline = req->rq_sent + req->rq_timeout;
+                if (req->rq_phase == RQ_PHASE_NEW)
+                        deadline = req->rq_sent;
+                else
+                        deadline = req->rq_sent + req->rq_timeout;
+
                 if (deadline <= now)    /* actually expired already */
                         timeout = 1;    /* ASAP */
                 else if (timeout == 0 || timeout > deadline - now)
@@ -993,19 +1742,20 @@ int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set)
         }
         RETURN(timeout);
 }
-                
 
 int ptlrpc_set_wait(struct ptlrpc_request_set *set)
 {
-        struct list_head      *tmp;
+        cfs_list_t            *tmp;
         struct ptlrpc_request *req;
         struct l_wait_info     lwi;
         int                    rc, timeout;
         ENTRY;
 
-        LASSERT(!list_empty(&set->set_requests));
-        list_for_each(tmp, &set->set_requests) {
-                req = list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+        if (cfs_list_empty(&set->set_requests))
+                RETURN(0);
+
+        cfs_list_for_each(tmp, &set->set_requests) {
+                req = cfs_list_entry(tmp, struct ptlrpc_request, rq_set_chain);
                 if (req->rq_phase == RQ_PHASE_NEW)
                         (void)ptlrpc_send_new_req(req);
         }
@@ -1015,29 +1765,55 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set)
 
                 /* wait until all complete, interrupted, or an in-flight
                  * req times out */
-                CDEBUG(D_HA, "set %p going to sleep for %d seconds\n",
+                CDEBUG(D_RPCTRACE, "set %p going to sleep for %d seconds\n",
                        set, timeout);
-                lwi = LWI_TIMEOUT_INTR((timeout ? timeout : 1) * HZ,
-                                       ptlrpc_expired_set,
-                                       ptlrpc_interrupted_set, set);
-                rc = l_wait_event(set->set_waitq, ptlrpc_check_set(set), &lwi);
+
+                if (timeout == 0 && !cfs_signal_pending())
+                        /*
+                         * No requests are in-flight (ether timed out
+                         * or delayed), so we can allow interrupts.
+                         * We still want to block for a limited time,
+                         * so we allow interrupts during the timeout.
+                         */
+                        lwi = LWI_TIMEOUT_INTR_ALL(cfs_time_seconds(1), 
+                                                   ptlrpc_expired_set,
+                                                   ptlrpc_interrupted_set, set);
+                else
+                        /*
+                         * At least one request is in flight, so no
+                         * interrupts are allowed. Wait until all
+                         * complete, or an in-flight req times out. 
+                         */
+                        lwi = LWI_TIMEOUT(cfs_time_seconds(timeout? timeout : 1),
+                                          ptlrpc_expired_set, set);
+
+                rc = l_wait_event(set->set_waitq, ptlrpc_check_set(NULL, set), &lwi);
 
                 LASSERT(rc == 0 || rc == -EINTR || rc == -ETIMEDOUT);
 
                 /* -EINTR => all requests have been flagged rq_intr so next
                  * check completes.
-                 * -ETIMEOUTD => someone timed out.  When all reqs have
+                 * -ETIMEDOUT => someone timed out.  When all reqs have
                  * timed out, signals are enabled allowing completion with
                  * EINTR.
                  * I don't really care if we go once more round the loop in
                  * the error cases -eeb. */
-        } while (rc != 0 || set->set_remaining != 0);
+                if (rc == 0 && cfs_atomic_read(&set->set_remaining) == 0) {
+                        cfs_list_for_each(tmp, &set->set_requests) {
+                                req = cfs_list_entry(tmp, struct ptlrpc_request,
+                                                     rq_set_chain);
+                                cfs_spin_lock(&req->rq_lock);
+                                req->rq_invalid_rqset = 1;
+                                cfs_spin_unlock(&req->rq_lock);
+                        }
+                }
+        } while (rc != 0 || cfs_atomic_read(&set->set_remaining) != 0);
 
-        LASSERT(set->set_remaining == 0);
+        LASSERT(cfs_atomic_read(&set->set_remaining) == 0);
 
         rc = 0;
-        list_for_each(tmp, &set->set_requests) {
-                req = list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+        cfs_list_for_each(tmp, &set->set_requests) {
+                req = cfs_list_entry(tmp, struct ptlrpc_request, rq_set_chain);
 
                 LASSERT(req->rq_phase == RQ_PHASE_COMPLETE);
                 if (req->rq_status != 0)
@@ -1048,6 +1824,18 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set)
                 int (*interpreter)(struct ptlrpc_request_set *set,void *,int) =
                         set->set_interpret;
                 rc = interpreter (set, set->set_arg, rc);
+        } else {
+                struct ptlrpc_set_cbdata *cbdata, *n;
+                int err;
+
+                cfs_list_for_each_entry_safe(cbdata, n,
+                                         &set->set_cblist, psc_item) {
+                        cfs_list_del_init(&cbdata->psc_item);
+                        err = cbdata->psc_interpret(set, cbdata->psc_data, rc);
+                        if (err && !rc)
+                                rc = err;
+                        OBD_FREE_PTR(cbdata);
+                }
         }
 
         RETURN(rc);
@@ -1063,34 +1851,33 @@ static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked)
 
         LASSERTF(!request->rq_receiving_reply, "req %p\n", request);
         LASSERTF(request->rq_rqbd == NULL, "req %p\n",request);/* client-side */
-        LASSERTF(list_empty(&request->rq_list), "req %p\n", request);
-        LASSERTF(list_empty(&request->rq_set_chain), "req %p\n", request);
-        LASSERT(request->rq_cred);
+        LASSERTF(cfs_list_empty(&request->rq_list), "req %p\n", request);
+        LASSERTF(cfs_list_empty(&request->rq_set_chain), "req %p\n", request);
+        LASSERTF(cfs_list_empty(&request->rq_exp_list), "req %p\n", request);
+        LASSERTF(!request->rq_replay, "req %p\n", request);
+        LASSERT(request->rq_cli_ctx || request->rq_fake);
+
+        req_capsule_fini(&request->rq_pill);
 
         /* We must take it off the imp_replay_list first.  Otherwise, we'll set
          * request->rq_reqmsg to NULL while osc_close is dereferencing it. */
         if (request->rq_import != NULL) {
-                unsigned long flags = 0;
                 if (!locked)
-                        spin_lock_irqsave(&request->rq_import->imp_lock, flags);
-                list_del_init(&request->rq_replay_list);
+                        cfs_spin_lock(&request->rq_import->imp_lock);
+                cfs_list_del_init(&request->rq_replay_list);
                 if (!locked)
-                        spin_unlock_irqrestore(&request->rq_import->imp_lock,
-                                               flags);
+                        cfs_spin_unlock(&request->rq_import->imp_lock);
         }
-        LASSERTF(list_empty(&request->rq_replay_list), "req %p\n", request);
+        LASSERTF(cfs_list_empty(&request->rq_replay_list), "req %p\n", request);
 
-        if (atomic_read(&request->rq_refcount) != 0) {
+        if (cfs_atomic_read(&request->rq_refcount) != 0) {
                 DEBUG_REQ(D_ERROR, request,
                           "freeing request with nonzero refcount");
                 LBUG();
         }
 
         if (request->rq_repbuf != NULL)
-                ptlrpcs_cli_free_repbuf(request);
-        if (request->rq_reqbuf != NULL)
-                ptlrpcs_cli_free_reqbuf(request);
-
+                sptlrpc_cli_free_repbuf(request);
         if (request->rq_export != NULL) {
                 class_export_put(request->rq_export);
                 request->rq_export = NULL;
@@ -1102,14 +1889,17 @@ static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked)
         if (request->rq_bulk != NULL)
                 ptlrpc_free_bulk(request->rq_bulk);
 
-        ptlrpcs_req_drop_cred(request);
-        OBD_FREE(request, sizeof(*request));
-        EXIT;
-}
+        if (request->rq_reqbuf != NULL || request->rq_clrbuf != NULL)
+                sptlrpc_cli_free_reqbuf(request);
 
-void ptlrpc_free_req(struct ptlrpc_request *request)
-{
-        __ptlrpc_free_req(request, 0);
+        if (request->rq_cli_ctx)
+                sptlrpc_req_put_ctx(request, !locked);
+
+        if (request->rq_pool)
+                __ptlrpc_free_req_to_pool(request);
+        else
+                OBD_FREE(request, sizeof(*request));
+        EXIT;
 }
 
 static int __ptlrpc_req_finished(struct ptlrpc_request *request, int locked);
@@ -1133,9 +1923,9 @@ static int __ptlrpc_req_finished(struct ptlrpc_request *request, int locked)
         }
 
         DEBUG_REQ(D_INFO, request, "refcount now %u",
-                  atomic_read(&request->rq_refcount) - 1);
+                  cfs_atomic_read(&request->rq_refcount) - 1);
 
-        if (atomic_dec_and_test(&request->rq_refcount)) {
+        if (cfs_atomic_dec_and_test(&request->rq_refcount)) {
                 __ptlrpc_free_req(request, locked);
                 RETURN(1);
         }
@@ -1148,27 +1938,65 @@ void ptlrpc_req_finished(struct ptlrpc_request *request)
         __ptlrpc_req_finished(request, 0);
 }
 
+__u64 ptlrpc_req_xid(struct ptlrpc_request *request)
+{
+        return request->rq_xid;
+}
+EXPORT_SYMBOL(ptlrpc_req_xid);
+
 /* Disengage the client's reply buffer from the network
  * NB does _NOT_ unregister any client-side bulk.
  * IDEMPOTENT, but _not_ safe against concurrent callers.
  * The request owner (i.e. the thread doing the I/O) must call...
  */
-void ptlrpc_unregister_reply (struct ptlrpc_request *request)
+int ptlrpc_unregister_reply(struct ptlrpc_request *request, int async)
 {
         int                rc;
-        wait_queue_head_t *wq;
+        cfs_waitq_t       *wq;
         struct l_wait_info lwi;
 
-        LASSERT(!in_interrupt ());             /* might sleep */
+        /*
+         * Might sleep.
+         */
+        LASSERT(!cfs_in_interrupt());
 
-        if (!ptlrpc_client_receiving_reply(request))
-                return;
+        /*
+         * Let's setup deadline for reply unlink.
+         */
+        if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_LONG_REPL_UNLINK) &&
+            async && request->rq_reply_deadline == 0)
+                request->rq_reply_deadline = cfs_time_current_sec()+LONG_UNLINK;
+
+        /*
+         * Nothing left to do.
+         */
+        if (!ptlrpc_client_recv_or_unlink(request))
+                RETURN(1);
+
+        LNetMDUnlink(request->rq_reply_md_h);
+
+        /*
+         * Let's check it once again.
+         */
+        if (!ptlrpc_client_recv_or_unlink(request))
+                RETURN(1);
 
-        PtlMDUnlink (request->rq_reply_md_h);
+        /*
+         * Move to "Unregistering" phase as reply was not unlinked yet.
+         */
+        ptlrpc_rqphase_move(request, RQ_PHASE_UNREGISTERING);
 
-        /* We have to l_wait_event() whatever the result, to give liblustre
-         * a chance to run reply_in_callback() */
+        /*
+         * Do not wait for unlink to finish.
+         */
+        if (async)
+                RETURN(0);
 
+        /*
+         * We have to l_wait_event() whatever the result, to give liblustre
+         * a chance to run reply_in_callback(), and to make sure we've
+         * unlinked before returning a req to the pool.
+         */
         if (request->rq_set != NULL)
                 wq = &request->rq_set->set_waitq;
         else
@@ -1177,20 +2005,27 @@ void ptlrpc_unregister_reply (struct ptlrpc_request *request)
         for (;;) {
                 /* Network access will complete in finite time but the HUGE
                  * timeout lets us CWARN for visibility of sluggish NALs */
-                lwi = LWI_TIMEOUT(300 * HZ, NULL, NULL);
-                rc = l_wait_event (*wq, !ptlrpc_client_receiving_reply(request), &lwi);
-                if (rc == 0)
-                        return;
+                lwi = LWI_TIMEOUT_INTERVAL(cfs_time_seconds(LONG_UNLINK),
+                                           cfs_time_seconds(1), NULL, NULL);
+                rc = l_wait_event(*wq, !ptlrpc_client_recv_or_unlink(request),
+                                  &lwi);
+                if (rc == 0) {
+                        ptlrpc_rqphase_move(request, request->rq_next_phase);
+                        RETURN(1);
+                }
 
-                LASSERT (rc == -ETIMEDOUT);
-                DEBUG_REQ(D_WARNING, request, "Unexpectedly long timeout");
+                LASSERT(rc == -ETIMEDOUT);
+                DEBUG_REQ(D_WARNING, request, "Unexpectedly long timeout "
+                          "rvcng=%d unlnk=%d", request->rq_receiving_reply,
+                          request->rq_must_unlink);
         }
+        RETURN(0);
 }
 
 /* caller must hold imp->imp_lock */
 void ptlrpc_free_committed(struct obd_import *imp)
 {
-        struct list_head *tmp, *saved;
+        cfs_list_t *tmp, *saved;
         struct ptlrpc_request *req;
         struct ptlrpc_request *last_req = NULL; /* temporary fire escape */
         ENTRY;
@@ -1199,52 +2034,57 @@ void ptlrpc_free_committed(struct obd_import *imp)
 
         LASSERT_SPIN_LOCKED(&imp->imp_lock);
 
-        CDEBUG(D_HA, "%s: committing for last_committed "LPU64"\n",
-               imp->imp_obd->obd_name, imp->imp_peer_committed_transno);
 
-        list_for_each_safe(tmp, saved, &imp->imp_replay_list) {
-                req = list_entry(tmp, struct ptlrpc_request, rq_replay_list);
+        if (imp->imp_peer_committed_transno == imp->imp_last_transno_checked &&
+            imp->imp_generation == imp->imp_last_generation_checked) {
+                CDEBUG(D_RPCTRACE, "%s: skip recheck: last_committed "LPU64"\n",
+                       imp->imp_obd->obd_name, imp->imp_peer_committed_transno);
+                EXIT;
+                return;
+        }
+        CDEBUG(D_RPCTRACE, "%s: committing for last_committed "LPU64" gen %d\n",
+               imp->imp_obd->obd_name, imp->imp_peer_committed_transno,
+               imp->imp_generation);
+        imp->imp_last_transno_checked = imp->imp_peer_committed_transno;
+        imp->imp_last_generation_checked = imp->imp_generation;
+
+        cfs_list_for_each_safe(tmp, saved, &imp->imp_replay_list) {
+                req = cfs_list_entry(tmp, struct ptlrpc_request,
+                                     rq_replay_list);
 
                 /* XXX ok to remove when 1357 resolved - rread 05/29/03  */
                 LASSERT(req != last_req);
                 last_req = req;
 
+                if (req->rq_transno == 0) {
+                        DEBUG_REQ(D_EMERG, req, "zero transno during replay");
+                        LBUG();
+                }
                 if (req->rq_import_generation < imp->imp_generation) {
-                        DEBUG_REQ(D_HA, req, "freeing request with old gen");
+                        DEBUG_REQ(D_RPCTRACE, req, "free request with old gen");
                         GOTO(free_req, 0);
                 }
 
                 if (req->rq_replay) {
-#warning "REMOVE THIS CRAP ONCE 6403 SOLVED -bzzz"
-                        struct mdc_open_data {
-                                struct obd_client_handle *mod_och;
-                                struct ptlrpc_request    *mod_open_req;
-                                struct ptlrpc_request    *mod_close_req;
-                        };
-                        struct mdc_open_data *mod = req->rq_cb_data;
-                        if (mod == NULL || mod->mod_close_req == NULL) {
-                                DEBUG_REQ(D_HA, req, "keeping (FL_REPLAY)");
-                                continue;
-                        }
-                        DEBUG_REQ(D_HA, req, "keeping (FL_REPLAY), "
-                                  "closed by x"LPD64"/t"LPD64,
-                                  mod->mod_close_req->rq_xid,
-                                  mod->mod_close_req->rq_repmsg->transno);
+                        DEBUG_REQ(D_RPCTRACE, req, "keeping (FL_REPLAY)");
                         continue;
                 }
 
                 /* not yet committed */
                 if (req->rq_transno > imp->imp_peer_committed_transno) {
-                        DEBUG_REQ(D_HA, req, "stopping search");
+                        DEBUG_REQ(D_RPCTRACE, req, "stopping search");
                         break;
                 }
 
-                DEBUG_REQ(D_HA, req, "committing (last_committed "LPU64")",
+                DEBUG_REQ(D_RPCTRACE, req, "commit (last_committed "LPU64")",
                           imp->imp_peer_committed_transno);
 free_req:
+                cfs_spin_lock(&req->rq_lock);
+                req->rq_replay = 0;
+                cfs_spin_unlock(&req->rq_lock);
                 if (req->rq_commit_cb != NULL)
                         req->rq_commit_cb(req);
-                list_del_init(&req->rq_replay_list);
+                cfs_list_del_init(&req->rq_replay_list);
                 __ptlrpc_req_finished(req, 1);
         }
 
@@ -1261,86 +2101,64 @@ void ptlrpc_cleanup_client(struct obd_import *imp)
 
 void ptlrpc_resend_req(struct ptlrpc_request *req)
 {
-        unsigned long flags;
-
         DEBUG_REQ(D_HA, req, "going to resend");
-        req->rq_reqmsg->handle.cookie = 0;
+        lustre_msg_set_handle(req->rq_reqmsg, &(struct lustre_handle){ 0 });
         req->rq_status = -EAGAIN;
 
-        spin_lock_irqsave (&req->rq_lock, flags);
+        cfs_spin_lock(&req->rq_lock);
         req->rq_resend = 1;
         req->rq_net_err = 0;
         req->rq_timedout = 0;
         if (req->rq_bulk) {
                 __u64 old_xid = req->rq_xid;
-                
+
                 /* ensure previous bulk fails */
                 req->rq_xid = ptlrpc_next_xid();
                 CDEBUG(D_HA, "resend bulk old x"LPU64" new x"LPU64"\n",
                        old_xid, req->rq_xid);
         }
-        ptlrpc_wake_client_req(req);
-        spin_unlock_irqrestore (&req->rq_lock, flags);
+        ptlrpc_client_wake_req(req);
+        cfs_spin_unlock(&req->rq_lock);
 }
 
 /* XXX: this function and rq_status are currently unused */
 void ptlrpc_restart_req(struct ptlrpc_request *req)
 {
-        unsigned long flags;
-
         DEBUG_REQ(D_HA, req, "restarting (possibly-)completed request");
         req->rq_status = -ERESTARTSYS;
 
-        spin_lock_irqsave (&req->rq_lock, flags);
+        cfs_spin_lock(&req->rq_lock);
         req->rq_restart = 1;
         req->rq_timedout = 0;
-        ptlrpc_wake_client_req(req);
-        spin_unlock_irqrestore (&req->rq_lock, flags);
-}
-
-static int expired_request(void *data)
-{
-        struct ptlrpc_request *req = data;
-        ENTRY;
-
-        /* some failure can suspend regular timeouts */
-        if (ptlrpc_check_suspend())
-                RETURN(1);
-
-        RETURN(ptlrpc_expire_one_request(req));
-}
-
-static void interrupted_request(void *data)
-{
-        unsigned long flags;
-
-        struct ptlrpc_request *req = data;
-        DEBUG_REQ(D_HA, req, "request interrupted");
-        spin_lock_irqsave (&req->rq_lock, flags);
-        req->rq_intr = 1;
-        spin_unlock_irqrestore (&req->rq_lock, flags);
+        ptlrpc_client_wake_req(req);
+        cfs_spin_unlock(&req->rq_lock);
 }
 
 struct ptlrpc_request *ptlrpc_request_addref(struct ptlrpc_request *req)
 {
         ENTRY;
-        atomic_inc(&req->rq_refcount);
+        cfs_atomic_inc(&req->rq_refcount);
         RETURN(req);
 }
 
 void ptlrpc_retain_replayable_request(struct ptlrpc_request *req,
                                       struct obd_import *imp)
 {
-        struct list_head *tmp;
+        cfs_list_t *tmp;
 
         LASSERT_SPIN_LOCKED(&imp->imp_lock);
 
-        /* clear this  for new requests that were resent as well
+        if (req->rq_transno == 0) {
+                DEBUG_REQ(D_EMERG, req, "saving request with zero transno");
+                LBUG();
+        }
+
+        /* clear this for new requests that were resent as well
            as resent replayed requests. */
         lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT);
 
         /* don't re-add requests that have been replayed */
-        if (!list_empty(&req->rq_replay_list))
+        if (!cfs_list_empty(&req->rq_replay_list))
                 return;
 
         lustre_msg_add_flags(req->rq_reqmsg, MSG_REPLAY);
@@ -1348,9 +2166,10 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req,
         LASSERT(imp->imp_replayable);
         /* Balanced in ptlrpc_free_committed, usually. */
         ptlrpc_request_addref(req);
-        list_for_each_prev(tmp, &imp->imp_replay_list) {
+        cfs_list_for_each_prev(tmp, &imp->imp_replay_list) {
                 struct ptlrpc_request *iter =
-                        list_entry(tmp, struct ptlrpc_request, rq_replay_list);
+                        cfs_list_entry(tmp, struct ptlrpc_request,
+                                       rq_replay_list);
 
                 /* We may have duplicate transnos if we create and then
                  * open a file, or for closes retained if to match creating
@@ -1367,217 +2186,37 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req,
                                 continue;
                 }
 
-                list_add(&req->rq_replay_list, &iter->rq_replay_list);
+                cfs_list_add(&req->rq_replay_list, &iter->rq_replay_list);
                 return;
         }
 
-        list_add_tail(&req->rq_replay_list, &imp->imp_replay_list);
+        cfs_list_add(&req->rq_replay_list, &imp->imp_replay_list);
 }
 
 int ptlrpc_queue_wait(struct ptlrpc_request *req)
 {
-        char str[PTL_NALFMT_SIZE];
-        int rc = 0;
-        int brc;
-        struct l_wait_info lwi;
-        struct obd_import *imp = req->rq_import;
-        unsigned long flags;
-        int timeout = 0;
+        struct ptlrpc_request_set *set;
+        int rc;
         ENTRY;
 
         LASSERT(req->rq_set == NULL);
         LASSERT(!req->rq_receiving_reply);
-        atomic_inc(&imp->imp_inflight);
 
-        if (imp->imp_connection == NULL) {
-                CERROR("request on not connected import %s\n",
-                        imp->imp_obd->obd_name);
-                RETURN(-EINVAL);
+        set = ptlrpc_prep_set();
+        if (set == NULL) {
+                CERROR("Unable to allocate ptlrpc set.");
+                RETURN(-ENOMEM);
         }
 
         /* for distributed debugging */
-        req->rq_reqmsg->status = current->pid;
-        LASSERT(imp->imp_obd != NULL);
-        CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:ni:nid:opc "
-               "%s:%s:%d:"LPU64":%s:%s:%d\n", current->comm,
-               imp->imp_obd->obd_uuid.uuid,
-               req->rq_reqmsg->status, req->rq_xid,
-               imp->imp_connection->c_peer.peer_ni->pni_name,
-               ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
-               req->rq_reqmsg->opc);
-
-        /* Mark phase here for a little debug help */
-        req->rq_phase = RQ_PHASE_RPC;
-
-        spin_lock_irqsave(&imp->imp_lock, flags);
-        req->rq_import_generation = imp->imp_generation;
-restart:
-        if (ptlrpc_import_delay_req(imp, req, &rc)) {
-                list_del(&req->rq_list);
-
-                list_add_tail(&req->rq_list, &imp->imp_delayed_list);
-                spin_unlock_irqrestore(&imp->imp_lock, flags);
-
-                DEBUG_REQ(D_HA, req, "\"%s\" waiting for recovery: (%s != %s)",
-                          current->comm, 
-                          ptlrpc_import_state_name(req->rq_send_state), 
-                          ptlrpc_import_state_name(imp->imp_state));
-                lwi = LWI_INTR(interrupted_request, req);
-                rc = l_wait_event(req->rq_reply_waitq,
-                                  (req->rq_send_state == imp->imp_state ||
-                                   req->rq_err),
-                                  &lwi);
-                DEBUG_REQ(D_HA, req, "\"%s\" awake: (%s == %s or %d == 1)",
-                          current->comm, 
-                          ptlrpc_import_state_name(imp->imp_state), 
-                          ptlrpc_import_state_name(req->rq_send_state),
-                          req->rq_err);
-
-                spin_lock_irqsave(&imp->imp_lock, flags);
-                list_del_init(&req->rq_list);
-
-                if (req->rq_err) {
-                        rc = -EIO;
-                } 
-                else if (req->rq_intr) {
-                        rc = -EINTR;
-                }
-                else if (req->rq_no_resend) {
-                        spin_unlock_irqrestore(&imp->imp_lock, flags);
-                        GOTO(out, rc = -ETIMEDOUT);
-                }
-                else {
-                        GOTO(restart, rc);
-                }
-        } 
-
-        if (rc != 0) {
-                list_del_init(&req->rq_list);
-                spin_unlock_irqrestore(&imp->imp_lock, flags);
-                req->rq_status = rc; // XXX this ok?
-                GOTO(out, rc);
-        }
-
-        if (req->rq_resend) {
-                if (!req->rq_ptlrpcs_restart)
-                        lustre_msg_add_flags(req->rq_reqmsg, MSG_RESENT);
-
-                if (req->rq_bulk != NULL)
-                        ptlrpc_unregister_bulk (req);
-
-                DEBUG_REQ(D_HA, req, "resending: ");
-        }
-
-        /* XXX this is the same as ptlrpc_set_wait */
-        LASSERT(list_empty(&req->rq_list));
-        list_add_tail(&req->rq_list, &imp->imp_sending_list);
-        spin_unlock_irqrestore(&imp->imp_lock, flags);
-
-        rc = ptl_send_rpc(req);
-        if (rc) {
-                DEBUG_REQ(D_HA, req, "send failed (%d); recovering", rc);
-                timeout = 1;
-        } else {
-                timeout = MAX(req->rq_timeout * HZ, 1);
-                DEBUG_REQ(D_NET, req, "-- sleeping for %d jiffies", timeout);
-        }
-repeat:
-        lwi = LWI_TIMEOUT_INTR(timeout, expired_request, interrupted_request,
-                               req);
-        rc = l_wait_event(req->rq_reply_waitq, ptlrpc_check_reply(req), &lwi);
-        if (rc == -ETIMEDOUT && ptlrpc_check_and_wait_suspend(req))
-                goto repeat;
-        DEBUG_REQ(D_NET, req, "-- done sleeping");
-
-        CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:ni:nid:opc "
-               "%s:%s:%d:"LPU64":%s:%s:%d\n", current->comm,
-               imp->imp_obd->obd_uuid.uuid,
-               req->rq_reqmsg->status, req->rq_xid,
-               imp->imp_connection->c_peer.peer_ni->pni_name,
-               ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
-               req->rq_reqmsg->opc);
-
-        spin_lock_irqsave(&imp->imp_lock, flags);
-        list_del_init(&req->rq_list);
-        spin_unlock_irqrestore(&imp->imp_lock, flags);
-
-        /* If the reply was received normally, this just grabs the spinlock
-         * (ensuring the reply callback has returned), sees that
-         * req->rq_receiving_reply is clear and returns. */
-        ptlrpc_unregister_reply (req);
-
-        if (req->rq_err)
-                GOTO(out, rc = -EIO);
-
-        if (req->rq_ptlrpcs_err)
-                GOTO(out, rc = -EPERM);
-
-        /* Resend if we need to, unless we were interrupted. */
-        if (req->rq_resend && !req->rq_intr) {
-                /* ...unless we were specifically told otherwise. */
-                if (req->rq_no_resend)
-                        GOTO(out, rc = -ETIMEDOUT);
-                spin_lock_irqsave(&imp->imp_lock, flags);
-                goto restart;
-        }
-
-        if (req->rq_intr) {
-                /* Should only be interrupted if we timed out. */
-                if (!req->rq_timedout)
-                        DEBUG_REQ(D_ERROR, req,
-                                  "rq_intr set but rq_timedout not");
-                GOTO(out, rc = -EINTR);
-        }
-
-        if (req->rq_timedout) {                 /* non-recoverable timeout */
-                GOTO(out, rc = -ETIMEDOUT);
-        }
+        lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
 
-        if (!req->rq_replied) {
-                /* How can this be? -eeb */
-                DEBUG_REQ(D_ERROR, req, "!rq_replied: ");
-                LBUG();
-                GOTO(out, rc = req->rq_status);
-        }
-
-        rc = after_reply (req);
-        /* NB may return +ve success rc */
-        if (req->rq_resend) {
-                spin_lock_irqsave(&imp->imp_lock, flags);
-                goto restart;
-        }
-
- out:
-        if (req->rq_bulk != NULL) {
-                if (rc >= 0) {                  
-                        /* success so far.  Note that anything going wrong
-                         * with bulk now, is EXTREMELY strange, since the
-                         * server must have believed that the bulk
-                         * tranferred OK before she replied with success to
-                         * me. */
-                        lwi = LWI_TIMEOUT(timeout, NULL, NULL);
-                        brc = l_wait_event(req->rq_reply_waitq,
-                                           !ptlrpc_bulk_active(req->rq_bulk),
-                                           &lwi);
-                        LASSERT(brc == 0 || brc == -ETIMEDOUT);
-                        if (brc != 0) {
-                                LASSERT(brc == -ETIMEDOUT);
-                                DEBUG_REQ(D_ERROR, req, "bulk timed out");
-                                rc = brc;
-                        } else if (!req->rq_bulk->bd_success) {
-                                DEBUG_REQ(D_ERROR, req, "bulk transfer failed");
-                                rc = -EIO;
-                        }
-                }
-                if (rc < 0)
-                        ptlrpc_unregister_bulk (req);
-        }
-
-        LASSERT(!req->rq_receiving_reply);
-        req->rq_phase = RQ_PHASE_INTERPRET;
+        /* add a ref for the set (see comment in ptlrpc_set_add_req) */
+        ptlrpc_request_addref(req);
+        ptlrpc_set_add_req(set, req);
+        rc = ptlrpc_set_wait(set);
+        ptlrpc_set_destroy(set);
 
-        atomic_dec(&imp->imp_inflight);
-        wake_up(&imp->imp_recovery_waitq);
         RETURN(rc);
 }
 
@@ -1586,37 +2225,51 @@ struct ptlrpc_replay_async_args {
         int praa_old_status;
 };
 
-static int ptlrpc_replay_interpret(struct ptlrpc_request *req,
-                                    void * data, int rc)
+static int ptlrpc_replay_interpret(const struct lu_env *env,
+                                   struct ptlrpc_request *req,
+                                   void * data, int rc)
 {
         struct ptlrpc_replay_async_args *aa = data;
         struct obd_import *imp = req->rq_import;
-        unsigned long flags;
 
-        atomic_dec(&imp->imp_replay_inflight);
-        
-        if (!req->rq_replied) {
+        ENTRY;
+        cfs_atomic_dec(&imp->imp_replay_inflight);
+
+        if (!ptlrpc_client_replied(req)) {
                 CERROR("request replay timed out, restarting recovery\n");
                 GOTO(out, rc = -ETIMEDOUT);
         }
 
-#if SWAB_PARANOIA
-        /* Clear reply swab mask; this is a new reply in sender's byte order */
-        req->rq_rep_swab_mask = 0;
-#endif
-        LASSERT (req->rq_nob_received <= req->rq_repbuf_len);
-        rc = lustre_unpack_msg(req->rq_repmsg, req->rq_replen);
-        if (rc) {
-                CERROR("unpack_rep failed: %d\n", rc);
-                GOTO(out, rc = -EPROTO);
-        }
-
-        if (req->rq_repmsg->type == PTL_RPC_MSG_ERR && 
-            req->rq_repmsg->status == -ENOTCONN) 
-                GOTO(out, rc = req->rq_repmsg->status);
+        if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR &&
+            (lustre_msg_get_status(req->rq_repmsg) == -ENOTCONN ||
+             lustre_msg_get_status(req->rq_repmsg) == -ENODEV))
+                GOTO(out, rc = lustre_msg_get_status(req->rq_repmsg));
 
-        /* The transno had better not change over replay. */
-        LASSERT(req->rq_reqmsg->transno == req->rq_repmsg->transno);
+        /** VBR: check version failure */
+        if (lustre_msg_get_status(req->rq_repmsg) == -EOVERFLOW) {
+                /** replay was failed due to version mismatch */
+                DEBUG_REQ(D_WARNING, req, "Version mismatch during replay\n");
+                cfs_spin_lock(&imp->imp_lock);
+                imp->imp_vbr_failed = 1;
+                imp->imp_no_lock_replay = 1;
+                cfs_spin_unlock(&imp->imp_lock);
+        } else {
+                /** The transno had better not change over replay. */
+                LASSERTF(lustre_msg_get_transno(req->rq_reqmsg) ==
+                         lustre_msg_get_transno(req->rq_repmsg) ||
+                         lustre_msg_get_transno(req->rq_repmsg) == 0,
+                         LPX64"/"LPX64"\n",
+                         lustre_msg_get_transno(req->rq_reqmsg),
+                         lustre_msg_get_transno(req->rq_repmsg));
+        }
+
+        cfs_spin_lock(&imp->imp_lock);
+        /** if replays by version then gap was occur on server, no trust to locks */
+        if (lustre_msg_get_flags(req->rq_repmsg) & MSG_VERSION_REPLAY)
+                imp->imp_no_lock_replay = 1;
+        imp->imp_last_replay_transno = lustre_msg_get_transno(req->rq_reqmsg);
+        cfs_spin_unlock(&imp->imp_lock);
+        LASSERT(imp->imp_last_replay_transno);
 
         DEBUG_REQ(D_HA, req, "got rep");
 
@@ -1624,23 +2277,32 @@ static int ptlrpc_replay_interpret(struct ptlrpc_request *req,
         if (req->rq_replay_cb)
                 req->rq_replay_cb(req);
 
-        if (req->rq_replied && req->rq_repmsg->status != aa->praa_old_status) {
-                DEBUG_REQ(D_HA, req, "status %d, old was %d",
-                          req->rq_repmsg->status, aa->praa_old_status);
+        if (ptlrpc_client_replied(req) &&
+            lustre_msg_get_status(req->rq_repmsg) != aa->praa_old_status) {
+                DEBUG_REQ(D_ERROR, req, "status %d, old was %d",
+                          lustre_msg_get_status(req->rq_repmsg),
+                          aa->praa_old_status);
         } else {
                 /* Put it back for re-replay. */
-                req->rq_repmsg->status = aa->praa_old_status;
+                lustre_msg_set_status(req->rq_repmsg, aa->praa_old_status);
         }
 
-        spin_lock_irqsave(&imp->imp_lock, flags);
-        imp->imp_last_replay_transno = req->rq_transno;
-        spin_unlock_irqrestore(&imp->imp_lock, flags);
-
+        /*
+         * Errors while replay can set transno to 0, but
+         * imp_last_replay_transno shouldn't be set to 0 anyway
+         */
+        if (req->rq_transno > 0) {
+                cfs_spin_lock(&imp->imp_lock);
+                LASSERT(req->rq_transno <= imp->imp_last_replay_transno);
+                imp->imp_last_replay_transno = req->rq_transno;
+                cfs_spin_unlock(&imp->imp_lock);
+        } else
+                CERROR("Transno is 0 during replay!\n");
         /* continue with recovery */
         rc = ptlrpc_import_recovery_state_machine(imp);
  out:
         req->rq_send_state = aa->praa_old_state;
-        
+
         if (rc != 0)
                 /* this replay failed, so restart recovery */
                 ptlrpc_connect_import(imp, NULL);
@@ -1648,114 +2310,172 @@ static int ptlrpc_replay_interpret(struct ptlrpc_request *req,
         RETURN(rc);
 }
 
-
 int ptlrpc_replay_req(struct ptlrpc_request *req)
 {
         struct ptlrpc_replay_async_args *aa;
         ENTRY;
 
         LASSERT(req->rq_import->imp_state == LUSTRE_IMP_REPLAY);
-
         /* Not handling automatic bulk replay yet (or ever?) */
         LASSERT(req->rq_bulk == NULL);
 
-        DEBUG_REQ(D_HA, req, "REPLAY");
-
         LASSERT (sizeof (*aa) <= sizeof (req->rq_async_args));
-        aa = (struct ptlrpc_replay_async_args *)&req->rq_async_args;
+        aa = ptlrpc_req_async_args(req);
         memset(aa, 0, sizeof *aa);
 
         /* Prepare request to be resent with ptlrpcd */
         aa->praa_old_state = req->rq_send_state;
         req->rq_send_state = LUSTRE_IMP_REPLAY;
         req->rq_phase = RQ_PHASE_NEW;
-        aa->praa_old_status = req->rq_repmsg->status;
+        req->rq_next_phase = RQ_PHASE_UNDEFINED;
+        if (req->rq_repmsg)
+                aa->praa_old_status = lustre_msg_get_status(req->rq_repmsg);
         req->rq_status = 0;
-
         req->rq_interpret_reply = ptlrpc_replay_interpret;
-        atomic_inc(&req->rq_import->imp_replay_inflight);
+        /* Readjust the timeout for current conditions */
+        ptlrpc_at_set_req_timeout(req);
+
+        DEBUG_REQ(D_HA, req, "REPLAY");
+
+        cfs_atomic_inc(&req->rq_import->imp_replay_inflight);
         ptlrpc_request_addref(req); /* ptlrpcd needs a ref */
 
-        ptlrpcd_add_req(req);
+        ptlrpcd_add_req(req, PSCOPE_OTHER);
         RETURN(0);
 }
 
 void ptlrpc_abort_inflight(struct obd_import *imp)
 {
-        unsigned long flags;
-        struct list_head *tmp, *n;
+        cfs_list_t *tmp, *n;
         ENTRY;
 
         /* Make sure that no new requests get processed for this import.
          * ptlrpc_{queue,set}_wait must (and does) hold imp_lock while testing
          * this flag and then putting requests on sending_list or delayed_list.
          */
-        spin_lock_irqsave(&imp->imp_lock, flags);
+        cfs_spin_lock(&imp->imp_lock);
 
         /* XXX locking?  Maybe we should remove each request with the list
          * locked?  Also, how do we know if the requests on the list are
          * being freed at this time?
          */
-        list_for_each_safe(tmp, n, &imp->imp_sending_list) {
+        cfs_list_for_each_safe(tmp, n, &imp->imp_sending_list) {
                 struct ptlrpc_request *req =
-                        list_entry(tmp, struct ptlrpc_request, rq_list);
+                        cfs_list_entry(tmp, struct ptlrpc_request, rq_list);
 
-                DEBUG_REQ(D_HA, req, "inflight");
+                DEBUG_REQ(D_RPCTRACE, req, "inflight");
 
-                spin_lock (&req->rq_lock);
+                cfs_spin_lock (&req->rq_lock);
                 if (req->rq_import_generation < imp->imp_generation) {
                         req->rq_err = 1;
-                        ptlrpc_wake_client_req(req);
+                        req->rq_status = -EINTR;
+                        ptlrpc_client_wake_req(req);
                 }
-                spin_unlock (&req->rq_lock);
+                cfs_spin_unlock (&req->rq_lock);
         }
 
-        list_for_each_safe(tmp, n, &imp->imp_delayed_list) {
+        cfs_list_for_each_safe(tmp, n, &imp->imp_delayed_list) {
                 struct ptlrpc_request *req =
-                        list_entry(tmp, struct ptlrpc_request, rq_list);
+                        cfs_list_entry(tmp, struct ptlrpc_request, rq_list);
 
-                DEBUG_REQ(D_HA, req, "aborting waiting req");
+                DEBUG_REQ(D_RPCTRACE, req, "aborting waiting req");
 
-                spin_lock (&req->rq_lock);
+                cfs_spin_lock (&req->rq_lock);
                 if (req->rq_import_generation < imp->imp_generation) {
                         req->rq_err = 1;
-                        ptlrpc_wake_client_req(req);
+                        req->rq_status = -EINTR;
+                        ptlrpc_client_wake_req(req);
                 }
-                spin_unlock (&req->rq_lock);
+                cfs_spin_unlock (&req->rq_lock);
         }
 
-        list_for_each_safe(tmp, n, &imp->imp_rawrpc_list) {
+        /* Last chance to free reqs left on the replay list, but we
+         * will still leak reqs that haven't committed.  */
+        if (imp->imp_replayable)
+                ptlrpc_free_committed(imp);
+
+        cfs_spin_unlock(&imp->imp_lock);
+
+        EXIT;
+}
+
+void ptlrpc_abort_set(struct ptlrpc_request_set *set)
+{
+        cfs_list_t *tmp, *pos;
+
+        LASSERT(set != NULL);
+
+        cfs_list_for_each_safe(pos, tmp, &set->set_requests) {
                 struct ptlrpc_request *req =
-                        list_entry(tmp, struct ptlrpc_request, rq_list);
+                        cfs_list_entry(pos, struct ptlrpc_request,
+                                       rq_set_chain);
 
-                DEBUG_REQ(D_HA, req, "aborting raw rpc");
+                cfs_spin_lock(&req->rq_lock);
+                if (req->rq_phase != RQ_PHASE_RPC) {
+                        cfs_spin_unlock(&req->rq_lock);
+                        continue;
+                }
 
-                spin_lock(&req->rq_lock);
                 req->rq_err = 1;
-                ptlrpc_wake_client_req(req);
-                spin_unlock(&req->rq_lock);
+                req->rq_status = -EINTR;
+                ptlrpc_client_wake_req(req);
+                cfs_spin_unlock(&req->rq_lock);
         }
+}
 
-        /* Last chance to free reqs left on the replay list, but we
-         * will still leak reqs that haven't comitted.  */
-        if (imp->imp_replayable)
-                ptlrpc_free_committed(imp);
+static __u64 ptlrpc_last_xid;
+static cfs_spinlock_t ptlrpc_last_xid_lock;
 
-        spin_unlock_irqrestore(&imp->imp_lock, flags);
+/* Initialize the XID for the node.  This is common among all requests on
+ * this node, and only requires the property that it is monotonically
+ * increasing.  It does not need to be sequential.  Since this is also used
+ * as the RDMA match bits, it is important that a single client NOT have
+ * the same match bits for two different in-flight requests, hence we do
+ * NOT want to have an XID per target or similar.
+ *
+ * To avoid an unlikely collision between match bits after a client reboot
+ * (which would deliver old data into the wrong RDMA buffer) initialize
+ * the XID based on the current time, assuming a maximum RPC rate of 1M RPC/s.
+ * If the time is clearly incorrect, we instead use a 62-bit random number.
+ * In the worst case the random number will overflow 1M RPCs per second in
+ * 9133 years, or permutations thereof.
+ */
+#define YEAR_2004 (1ULL << 30)
+void ptlrpc_init_xid(void)
+{
+        time_t now = cfs_time_current_sec();
 
-        EXIT;
+        cfs_spin_lock_init(&ptlrpc_last_xid_lock);
+        if (now < YEAR_2004) {
+                ll_get_random_bytes(&ptlrpc_last_xid, sizeof(ptlrpc_last_xid));
+                ptlrpc_last_xid >>= 2;
+                ptlrpc_last_xid |= (1ULL << 61);
+        } else {
+                ptlrpc_last_xid = (__u64)now << 20;
+        }
 }
 
-static __u64 ptlrpc_last_xid = 0;
-static spinlock_t ptlrpc_last_xid_lock = SPIN_LOCK_UNLOCKED;
-
 __u64 ptlrpc_next_xid(void)
 {
         __u64 tmp;
-        spin_lock(&ptlrpc_last_xid_lock);
+        cfs_spin_lock(&ptlrpc_last_xid_lock);
         tmp = ++ptlrpc_last_xid;
-        spin_unlock(&ptlrpc_last_xid_lock);
+        cfs_spin_unlock(&ptlrpc_last_xid_lock);
         return tmp;
 }
 
-
+__u64 ptlrpc_sample_next_xid(void)
+{
+#if BITS_PER_LONG == 32
+        /* need to avoid possible word tearing on 32-bit systems */
+        __u64 tmp;
+        cfs_spin_lock(&ptlrpc_last_xid_lock);
+        tmp = ptlrpc_last_xid + 1;
+        cfs_spin_unlock(&ptlrpc_last_xid_lock);
+        return tmp;
+#else
+        /* No need to lock, since returned value is racy anyways */
+        return ptlrpc_last_xid + 1;
+#endif
+}
+EXPORT_SYMBOL(ptlrpc_sample_next_xid);