Whamcloud - gitweb
land b1_5 onto HEAD
[fs/lustre-release.git] / lustre / ptlrpc / pack_generic.c
index ba8fa3c..2a7e3b7 100644 (file)
@@ -6,20 +6,23 @@
  *   Author: Phil Schwan <phil@clusterfs.com>
  *   Author: Eric Barton <eeb@clusterfs.com>
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ *   This file is part of the Lustre file system, http://www.lustre.org
+ *   Lustre is a trademark of Cluster File Systems, Inc.
  *
- *   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.
+ *   You may have signed or agreed to another license before downloading
+ *   this software.  If so, you are bound by the terms and conditions
+ *   of that agreement, and the following does not apply to you.  See the
+ *   LICENSE file included with this distribution for more information.
  *
- *   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.
+ *   If you did not agree to a different license, then this copy of Lustre
+ *   is open source 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.
  *
- *   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.
+ *   In either case, 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
+ *   license text for more details.
  *
  * (Un)packing of OST requests
  *
 # include <liblustre.h>
 #endif
 
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
-#include <linux/lustre_net.h>
-#include <linux/lustre_sec.h>
-#include <linux/lustre_audit.h>
-#include <linux/fcntl.h>
+#include <libcfs/libcfs.h>
 
-#define HDR_SIZE(count) \
-    size_round(offsetof (struct lustre_msg, buflens[(count)]))
+#include <obd_support.h>
+#include <obd_class.h>
+#include <lustre_net.h>
+
+#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(1,8,0,0)
+#error "lustre_msg_v1 has been deprecated since 1.6.0, please remove it"
+#elif LUSTRE_VERSION_CODE > OBD_OCD_VERSION(1,6,50,0)
+#warning "lustre_msg_v1 has been deprecated since 1.6.0, consider removing it"
+#endif
+
+static inline int lustre_msg_hdr_size_v1(int count)
+{
+        return size_round(offsetof(struct lustre_msg_v1, lm_buflens[count]));
+}
+
+static inline int lustre_msg_hdr_size_v2(int count)
+{
+        return size_round(offsetof(struct lustre_msg_v2, lm_buflens[count]));
+}
 
 int lustre_msg_swabbed(struct lustre_msg *msg)
 {
-        return (msg->magic == __swab32(PTLRPC_MSG_MAGIC));
+        return (msg->lm_magic == LUSTRE_MSG_MAGIC_V1_SWABBED) ||
+               (msg->lm_magic == LUSTRE_MSG_MAGIC_V2_SWABBED);
+}
+
+static inline int
+lustre_msg_check_version_v2(struct lustre_msg_v2 *msg, __u32 version)
+{
+        __u32 ver = lustre_msg_get_version(msg);
+        return (ver & LUSTRE_VERSION_MASK) != version;
 }
 
 int lustre_msg_check_version(struct lustre_msg *msg, __u32 version)
 {
-        if (!lustre_msg_swabbed(msg))
-                return (msg->version & LUSTRE_VERSION_MASK) != version;
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return 0;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                return lustre_msg_check_version_v2(msg, version);
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return -EINVAL;
+        }
+}
+
+static inline int lustre_msg_size_v1(int count, int *lengths)
+{
+        int size;
+        int i;
+
+        LASSERT(count >= 0);
+        size = lustre_msg_hdr_size_v1(count);
+        for (i = 0; i < count; i++)
+                size += size_round(lengths[i]);
+
+        return size;
+}
+
+static inline int lustre_msg_size_v2(int count, int *lengths)
+{
+        int size;
+        int i;
 
-        return (__swab32(msg->version) & LUSTRE_VERSION_MASK) != version;
+        size = lustre_msg_hdr_size_v2(count);
+        for (i = 0; i < count; i++)
+                size += size_round(lengths[i]);
+
+        return size;
 }
 
-void lustre_init_msg(struct lustre_msg *msg, int count,
-                     int *lens, char **bufs)
+/* This returns the size of the buffer that is required to hold a lustre_msg
+ * with the given sub-buffer lengths. */
+int lustre_msg_size(__u32 magic, int count, int *lens)
 {
+        int size[] = { sizeof(struct ptlrpc_body) };
+
+        if (!lens) {
+                LASSERT(count == 1);
+                lens = size;
+        }
+
+        LASSERT(count > 0);
+        LASSERT(lens[MSG_PTLRPC_BODY_OFF] == sizeof(struct ptlrpc_body));
+
+        switch (magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                return lustre_msg_size_v1(count - 1, lens + 1);
+        case LUSTRE_MSG_MAGIC_V2:
+                return lustre_msg_size_v2(count, lens);
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", magic);
+                return -EINVAL;
+        }
+}
+
+static void
+lustre_init_msg_v1(void *m, int count, int *lens, char **bufs)
+{
+        struct lustre_msg_v1 *msg = (struct lustre_msg_v1 *)m;
         char *ptr;
-        int   i;
+        int i;
+
+        LASSERT(count >= 0);
+        msg->lm_magic = LUSTRE_MSG_MAGIC_V1;
+        msg->lm_version = PTLRPC_MSG_VERSION;
+        msg->lm_bufcount = count;
 
-        msg->magic = PTLRPC_MSG_MAGIC;
-        msg->version = PTLRPC_MSG_VERSION;
-        msg->bufcount = count;
         for (i = 0; i < count; i++)
-                msg->buflens[i] = lens[i];
+                msg->lm_buflens[i] = lens[i];
 
         if (bufs == NULL)
                 return;
 
-        ptr = (char *)msg + HDR_SIZE(count);
+        ptr = (char *)msg + lustre_msg_hdr_size_v1(count);
         for (i = 0; i < count; i++) {
                 char *tmp = bufs[i];
                 LOGL(tmp, lens[i], ptr);
         }
 }
 
-int lustre_secdesc_size(void)
+static void
+lustre_init_msg_v2(struct lustre_msg_v2 *msg, int count, int *lens, char **bufs)
 {
-#ifdef __KERNEL__
-        int ngroups = current_ngroups;
+        char *ptr;
+        int i;
 
-        if (ngroups > LUSTRE_MAX_GROUPS)
-                ngroups = LUSTRE_MAX_GROUPS;
+        msg->lm_bufcount = count;
+        /* XXX: lm_secflvr uninitialized here */
+        msg->lm_magic = LUSTRE_MSG_MAGIC_V2;
 
-        return sizeof(struct mds_req_sec_desc) +
-                sizeof(__u32) * ngroups;
-#else
+        for (i = 0; i < count; i++)
+                msg->lm_buflens[i] = lens[i];
+
+        if (bufs == NULL)
+                return;
+
+        ptr = (char *)msg + lustre_msg_hdr_size_v2(count);
+        for (i = 0; i < count; i++) {
+                char *tmp = bufs[i];
+                LOGL(tmp, lens[i], ptr);
+        }
+}
+
+static int lustre_pack_request_v1(struct ptlrpc_request *req,
+                                  int count, int *lens, char **bufs)
+{
+        int reqlen;
+
+        reqlen = lustre_msg_size_v1(count, lens);
+
+        /* See if we got it from prealloc pool */
+        if (req->rq_reqmsg) {
+                /* Cannot return error here, that would create
+                   infinite loop in ptlrpc_prep_req_pool */
+                /* In this case ptlrpc_prep_req_from_pool sets req->rq_reqlen
+                   to maximum size that would fit into this preallocated
+                   request */
+                LASSERTF(req->rq_reqlen >= reqlen, "req->rq_reqlen %d, "
+                                                   "reqlen %d\n",req->rq_reqlen,
+                                                    reqlen);
+                memset(req->rq_reqmsg, 0, reqlen);
+        } else {
+                OBD_ALLOC(req->rq_reqmsg, reqlen);
+                if (req->rq_reqmsg == NULL) {
+                        CERROR("alloc reqmsg (len %d) failed\n", reqlen);
+                        return -ENOMEM;
+                }
+        }
+
+        req->rq_reqlen = reqlen;
+
+        lustre_init_msg_v1(req->rq_reqmsg, count, lens, bufs);
         return 0;
-#endif
 }
 
-/*
- * because group info might have changed since last time we call
- * secdesc_size(), so here we did more sanity check to prevent garbage gids
- */
-void lustre_pack_secdesc(struct ptlrpc_request *req, int size)
+static int lustre_pack_request_v2(struct ptlrpc_request *req,
+                                  int count, int *lens, char **bufs)
 {
-#ifdef __KERNEL__
-        struct mds_req_sec_desc *rsd;
+        int reqlen;
+
+        reqlen = lustre_msg_size_v2(count, lens);
+
+        /* See if we got it from prealloc pool */
+        if (req->rq_reqmsg) {
+                /* Cannot return error here, that would create
+                   infinite loop in ptlrpc_prep_req_pool */
+                /* In this case ptlrpc_prep_req_from_pool sets req->rq_reqlen
+                   to maximum size that would fit into this preallocated
+                   request */
+                LASSERTF(req->rq_reqlen >= reqlen, "req->rq_reqlen %d, "
+                                                   "reqlen %d\n",req->rq_reqlen,
+                                                    reqlen);
+                memset(req->rq_reqmsg, 0, reqlen);
+        } else {
+                OBD_ALLOC(req->rq_reqmsg, reqlen);
+                if (req->rq_reqmsg == NULL) {
+                        CERROR("alloc reqmsg (len %d) failed\n", reqlen);
+                        return -ENOMEM;
+                }
+        }
 
-        rsd = lustre_msg_buf(req->rq_reqmsg,
-                             MDS_REQ_SECDESC_OFF, size);
-        
-        rsd->rsd_uid = current->uid;
-        rsd->rsd_gid = current->gid;
-        rsd->rsd_fsuid = current->fsuid;
-        rsd->rsd_fsgid = current->fsgid;
-        rsd->rsd_cap = current->cap_effective;
-        rsd->rsd_ngroups = (size - sizeof(*rsd)) / sizeof(__u32);
-        LASSERT(rsd->rsd_ngroups <= LUSTRE_MAX_GROUPS);
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4)
-        task_lock(current);
-        if (rsd->rsd_ngroups > current->group_info->ngroups)
-                rsd->rsd_ngroups = current->group_info->ngroups;
-        memcpy(rsd->rsd_groups, current->group_info->blocks[0],
-               rsd->rsd_ngroups * sizeof(__u32));
-        task_unlock(current);
-#else
-        LASSERT(rsd->rsd_ngroups <= NGROUPS);
-        if (rsd->rsd_ngroups > current->ngroups)
-                rsd->rsd_ngroups = current->ngroups;
-        memcpy(rsd->rsd_groups, current->groups,
-               rsd->rsd_ngroups * sizeof(__u32));
-#endif
-#endif
+        req->rq_reqlen = reqlen;
+
+        lustre_init_msg_v2(req->rq_reqmsg, count, lens, bufs);
+        lustre_msg_add_version(req->rq_reqmsg, PTLRPC_MSG_VERSION);
+        lustre_set_req_swabbed(req, MSG_PTLRPC_BODY_OFF);
+        return 0;
 }
 
-int lustre_pack_request(struct ptlrpc_request *req,
-                        int count, int *lens, char **bufs)
+int lustre_pack_request(struct ptlrpc_request *req, __u32 magic, int count,
+                        int *lens, char **bufs)
 {
-        int rc;
-        ENTRY;
+        int size[] = { sizeof(struct ptlrpc_body) };
 
-        req->rq_reqlen = lustre_msg_size(count, lens);
-        rc = ptlrpcs_cli_alloc_reqbuf(req, req->rq_reqlen);
-        if (rc)
-                RETURN(rc);
+        if (!lens) {
+                LASSERT(count == 1);
+                lens = size;
+        }
 
-        lustre_init_msg(req->rq_reqmsg, count, lens, bufs);
-        RETURN (0);
+        LASSERT(count > 0);
+        LASSERT(lens[MSG_PTLRPC_BODY_OFF] == sizeof(struct ptlrpc_body));
+
+        switch (magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                return lustre_pack_request_v1(req, count - 1, lens + 1,
+                                              bufs ? bufs + 1 : NULL);
+        case LUSTRE_MSG_MAGIC_V2:
+                return lustre_pack_request_v2(req, count, lens, bufs);
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", magic);
+                return -EINVAL;
+        }
 }
 
 #if RS_DEBUG
-LIST_HEAD(ptlrpc_rs_debug_lru);
-spinlock_t ptlrpc_rs_debug_lock = SPIN_LOCK_UNLOCKED;
+CFS_LIST_HEAD(ptlrpc_rs_debug_lru);
+spinlock_t ptlrpc_rs_debug_lock;
 
 #define PTLRPC_RS_DEBUG_LRU_ADD(rs)                                     \
 do {                                                                    \
-        unsigned long __flags;                                          \
-                                                                        \
-        spin_lock_irqsave(&ptlrpc_rs_debug_lock, __flags);              \
+        spin_lock(&ptlrpc_rs_debug_lock);                               \
         list_add_tail(&(rs)->rs_debug_list, &ptlrpc_rs_debug_lru);      \
-        spin_unlock_irqrestore(&ptlrpc_rs_debug_lock, __flags);         \
+        spin_unlock(&ptlrpc_rs_debug_lock);                             \
 } while (0)
 
-#define PTLRPC_RS_DEBUG_LRU_DEL(rs)                                     \
-do {                                                                    \
-        unsigned long __flags;                                          \
-                                                                        \
-        spin_lock_irqsave(&ptlrpc_rs_debug_lock, __flags);              \
-        list_del(&(rs)->rs_debug_list);                                 \
-        spin_unlock_irqrestore(&ptlrpc_rs_debug_lock, __flags);         \
+#define PTLRPC_RS_DEBUG_LRU_DEL(rs)             \
+do {                                            \
+        spin_lock(&ptlrpc_rs_debug_lock);       \
+        list_del(&(rs)->rs_debug_list);         \
+        spin_unlock(&ptlrpc_rs_debug_lock);     \
 } while (0)
 #else
 # define PTLRPC_RS_DEBUG_LRU_ADD(rs) do {} while(0)
 # define PTLRPC_RS_DEBUG_LRU_DEL(rs) do {} while(0)
 #endif
 
-int lustre_pack_reply(struct ptlrpc_request *req,
-                      int count, int *lens, char **bufs)
+static struct ptlrpc_reply_state *lustre_get_emerg_rs(struct ptlrpc_service *svc,
+                                                      int size)
+{
+        struct ptlrpc_reply_state *rs = NULL;
+
+        spin_lock(&svc->srv_lock);
+        /* See if we have anything in a pool, and wait if nothing */
+        while (list_empty(&svc->srv_free_rs_list)) {
+                struct l_wait_info lwi;
+                int rc;
+                spin_unlock(&svc->srv_lock);
+                /* If we cannot get anything for some long time, we better
+                   bail out instead of waiting infinitely */
+                lwi = LWI_TIMEOUT(cfs_time_seconds(10), NULL, NULL);
+                rc = l_wait_event(svc->srv_free_rs_waitq,
+                                  !list_empty(&svc->srv_free_rs_list), &lwi);
+                if (rc)
+                        goto out;
+                spin_lock(&svc->srv_lock);
+        }
+        
+        rs = list_entry(svc->srv_free_rs_list.next, struct ptlrpc_reply_state,
+                        rs_list);
+        list_del(&rs->rs_list);
+        spin_unlock(&svc->srv_lock);
+        LASSERT(rs);
+        LASSERTF(svc->srv_max_reply_size > size, "Want %d, prealloc %d\n", size,
+                 svc->srv_max_reply_size);
+        memset(rs, 0, size);
+        rs->rs_prealloc = 1;
+out:
+        return rs;
+}
+
+static int lustre_pack_reply_v1(struct ptlrpc_request *req, int count,
+                                int *lens, char **bufs)
 {
         struct ptlrpc_reply_state *rs;
-        int                        rc;
+        int                        msg_len;
+        int                        size;
         ENTRY;
 
-        LASSERT(req->rq_reply_state == NULL);
-        LASSERT(req->rq_svcsec);
-        LASSERT(req->rq_repmsg == NULL);
+        LASSERT (req->rq_reply_state == NULL);
 
-        req->rq_replen = lustre_msg_size(count, lens);
-        rc = svcsec_alloc_repbuf(req->rq_svcsec, req, req->rq_replen);
-        if (rc)
-                RETURN(rc);
-        LASSERT(req->rq_reply_state);
-        LASSERT(req->rq_repmsg == req->rq_reply_state->rs_msg);
-                                                                                                    
-        rs = req->rq_reply_state;
-        rs->rs_svcsec = svcsec_get(req->rq_svcsec);
+        msg_len = lustre_msg_size_v1(count, lens);
+        size = sizeof(struct ptlrpc_reply_state) + msg_len;
+        OBD_ALLOC(rs, size);
+        if (unlikely(rs == NULL)) {
+                rs = lustre_get_emerg_rs(req->rq_rqbd->rqbd_service, size);
+                if (!rs)
+                        RETURN (-ENOMEM);
+        }
+        atomic_set(&rs->rs_refcount, 1);        /* 1 ref for rq_reply_state */
         rs->rs_cb_id.cbid_fn = reply_out_callback;
         rs->rs_cb_id.cbid_arg = rs;
-        rs->rs_srv_ni = req->rq_rqbd->rqbd_srv_ni;
-        INIT_LIST_HEAD(&rs->rs_exp_list);
-        INIT_LIST_HEAD(&rs->rs_obd_list);
+        rs->rs_service = req->rq_rqbd->rqbd_service;
+        rs->rs_size = size;
+        CFS_INIT_LIST_HEAD(&rs->rs_exp_list);
+        CFS_INIT_LIST_HEAD(&rs->rs_obd_list);
+        rs->rs_msg = (struct lustre_msg *)(rs + 1);
 
-        lustre_init_msg(rs->rs_msg, count, lens, bufs);
+        req->rq_replen = msg_len;
+        req->rq_reply_state = rs;
+        req->rq_repmsg = rs->rs_msg;
+        lustre_init_msg_v1(rs->rs_msg, count, lens, bufs);
 
         PTLRPC_RS_DEBUG_LRU_ADD(rs);
 
         RETURN (0);
 }
 
-void lustre_free_reply_state(struct ptlrpc_reply_state *rs)
+static int lustre_pack_reply_v2(struct ptlrpc_request *req, int count,
+                                int *lens, char **bufs)
 {
-        struct ptlrpc_svcsec *svcsec = rs->rs_svcsec;
+        struct ptlrpc_reply_state *rs;
+        int                        msg_len;
+        int                        size;
+        ENTRY;
 
-        PTLRPC_RS_DEBUG_LRU_DEL(rs);
+        LASSERT(req->rq_reply_state == NULL);
 
-        LASSERT(!rs->rs_difficult || rs->rs_handled);
-        LASSERT(!rs->rs_on_net);
-        LASSERT(!rs->rs_scheduled);
-        LASSERT(rs->rs_export == NULL);
-        LASSERT(rs->rs_nlocks == 0);
-        LASSERT(list_empty(&rs->rs_exp_list));
-        LASSERT(list_empty(&rs->rs_obd_list));
-        LASSERT(svcsec);
+        msg_len = lustre_msg_size_v2(count, lens);
+        size = sizeof(struct ptlrpc_reply_state) + msg_len;
+        OBD_ALLOC(rs, size);
+        if (unlikely(rs == NULL)) {
+                rs = lustre_get_emerg_rs(req->rq_rqbd->rqbd_service, size);
+                if (!rs)
+                        RETURN (-ENOMEM);
+        }
+        atomic_set(&rs->rs_refcount, 1);        /* 1 ref for rq_reply_state */
+        rs->rs_cb_id.cbid_fn = reply_out_callback;
+        rs->rs_cb_id.cbid_arg = rs;
+        rs->rs_service = req->rq_rqbd->rqbd_service;
+        rs->rs_size = size;
+        CFS_INIT_LIST_HEAD(&rs->rs_exp_list);
+        CFS_INIT_LIST_HEAD(&rs->rs_obd_list);
+        rs->rs_msg = (struct lustre_msg *)(rs + 1);
+
+        req->rq_replen = msg_len;
+        req->rq_reply_state = rs;
+        req->rq_repmsg = rs->rs_msg;
+        lustre_init_msg_v2(rs->rs_msg, count, lens, bufs);
+        lustre_msg_add_version(rs->rs_msg, PTLRPC_MSG_VERSION);
+        lustre_set_rep_swabbed(req, MSG_PTLRPC_BODY_OFF);
 
-        if (svcsec->free_repbuf)
-                svcsec->free_repbuf(svcsec, rs);
-        else
-                svcsec_free_reply_state(rs);
+        PTLRPC_RS_DEBUG_LRU_ADD(rs);
 
-        svcsec_put(svcsec);
+        RETURN(0);
 }
 
-/* This returns the size of the buffer that is required to hold a lustre_msg
- * with the given sub-buffer lengths. */
-int lustre_msg_size(int count, int *lengths)
+int lustre_pack_reply(struct ptlrpc_request *req, int count, int *lens,
+                      char **bufs)
 {
-        int size;
-        int i;
+        int size[] = { sizeof(struct ptlrpc_body) };
 
-        size = HDR_SIZE (count);
-        for (i = 0; i < count; i++)
-                size += size_round(lengths[i]);
+        if (!lens) {
+                LASSERT(count == 1);
+                lens = size;
+        }
 
-        return size;
+        LASSERT(count > 0);
+        LASSERT(lens[MSG_PTLRPC_BODY_OFF] == sizeof(struct ptlrpc_body));
+
+        switch (req->rq_reqmsg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return lustre_pack_reply_v1(req, count - 1, lens + 1,
+                                            bufs ? bufs + 1 : NULL);
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                return lustre_pack_reply_v2(req, count, lens, bufs);
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n",
+                         req->rq_reqmsg->lm_magic);
+                return -EINVAL;
+        }
 }
 
-int lustre_unpack_msg(struct lustre_msg *m, int len)
+void *lustre_msg_buf_v1(void *msg, int n, int min_size)
+{
+        struct lustre_msg_v1 *m = (struct lustre_msg_v1 *)msg;
+        int i, offset, buflen, bufcount;
+
+        LASSERT(m != NULL);
+        LASSERT(n >= 0);
+
+        bufcount = m->lm_bufcount;
+        if (n >= bufcount) {
+                CDEBUG(D_INFO, "msg %p buffer[%d] not present (count %d)\n",
+                       m, n, bufcount);
+                return NULL;
+        }
+
+        buflen = m->lm_buflens[n];
+        if (buflen < min_size) {
+                CERROR("msg %p buffer[%d] size %d too small (required %d)\n",
+                       m, n, buflen, min_size);
+                LBUG();
+                return NULL;
+        }
+
+        offset = lustre_msg_hdr_size_v1(bufcount);
+        for (i = 0; i < n; i++)
+                offset += size_round(m->lm_buflens[i]);
+
+        return (char *)m + offset;
+}
+
+void *lustre_msg_buf_v2(struct lustre_msg_v2 *m, int n, int min_size)
+{
+        int i, offset, buflen, bufcount;
+
+        LASSERT(m != NULL);
+        LASSERT(n >= 0);
+
+        bufcount = m->lm_bufcount;
+        if (n >= bufcount) {
+                CDEBUG(D_INFO, "msg %p buffer[%d] not present (count %d)\n",
+                       m, n, bufcount);
+                return NULL;
+        }
+
+        buflen = m->lm_buflens[n];
+        if (buflen < min_size) {
+                CERROR("msg %p buffer[%d] size %d too small (required %d)\n",
+                       m, n, buflen, min_size);
+                return NULL;
+        }
+
+        offset = lustre_msg_hdr_size_v2(bufcount);
+        for (i = 0; i < n; i++)
+                offset += size_round(m->lm_buflens[i]);
+
+        return (char *)m + offset;
+}
+
+void *lustre_msg_buf(struct lustre_msg *m, int n, int min_size)
 {
-        int   flipped;
-        int   required_len;
-        int   i;
+        switch (m->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return lustre_msg_buf_v1(m, n - 1, min_size);
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                return lustre_msg_buf_v2(m, n, min_size);
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", m->lm_magic);
+                return NULL;
+        }
+}
+
+void lustre_shrink_reply_v1(struct ptlrpc_request *req, int segment,
+                            unsigned int newlen, int move_data)
+{
+        struct lustre_msg_v1 *msg = (struct lustre_msg_v1 *)req->rq_repmsg;
+        char *tail = NULL, *newpos;
+        int tail_len = 0, n;
+
+        LASSERT(req->rq_reply_state);
+        LASSERT(msg);
+        LASSERT(segment >= 0);
+        LASSERT(msg->lm_bufcount > segment);
+        LASSERT(msg->lm_buflens[segment] >= newlen);
+
+        if (msg->lm_buflens[segment] == newlen)
+                return;
+
+        if (move_data && msg->lm_bufcount > segment + 1) {
+                tail = lustre_msg_buf_v1(msg, segment + 1, 0);
+                for (n = segment + 1; n < msg->lm_bufcount; n++)
+                        tail_len += size_round(msg->lm_buflens[n]);
+        }
+
+        msg->lm_buflens[segment] = newlen;
+
+        if (tail && tail_len) {
+                newpos = lustre_msg_buf_v1(msg, segment + 1, 0);
+                LASSERT(newpos <= tail);
+                if (newpos != tail)
+                        memcpy(newpos, tail, tail_len);
+        }
+
+        if (newlen == 0 && msg->lm_bufcount > segment + 1) {
+                memmove(&msg->lm_buflens[segment], &msg->lm_buflens[segment + 1],
+                        (msg->lm_bufcount - segment - 1) * sizeof(__u32));
+                msg->lm_buflens[msg->lm_bufcount - 1] = 0;
+        }
+
+        req->rq_replen = lustre_msg_size_v1(msg->lm_bufcount, msg->lm_buflens);
+}
+
+void lustre_shrink_reply_v2(struct ptlrpc_request *req, int segment,
+                            unsigned int newlen, int move_data)
+{
+        struct lustre_msg_v2 *msg = req->rq_repmsg;
+        char *tail = NULL, *newpos;
+        int tail_len = 0, n;
+
+        LASSERT(req->rq_reply_state);
+        LASSERT(msg);
+        LASSERT(msg->lm_bufcount > segment);
+        LASSERT(msg->lm_buflens[segment] >= newlen);
+
+        if (msg->lm_buflens[segment] == newlen)
+                return;
+
+        if (move_data && msg->lm_bufcount > segment + 1) {
+                tail = lustre_msg_buf_v2(msg, segment + 1, 0);
+                for (n = segment + 1; n < msg->lm_bufcount; n++)
+                        tail_len += size_round(msg->lm_buflens[n]);
+        }
+
+        msg->lm_buflens[segment] = newlen;
+
+        if (tail && tail_len) {
+                newpos = lustre_msg_buf_v2(msg, segment + 1, 0);
+                LASSERT(newpos <= tail);
+                if (newpos != tail)
+                        memcpy(newpos, tail, tail_len);
+        }
+
+        if (newlen == 0 && msg->lm_bufcount > segment + 1) {
+                memmove(&msg->lm_buflens[segment], &msg->lm_buflens[segment + 1],
+                        (msg->lm_bufcount - segment - 1) * sizeof(__u32));
+                msg->lm_buflens[msg->lm_bufcount - 1] = 0;
+        }
+
+        req->rq_replen = lustre_msg_size_v2(msg->lm_bufcount, msg->lm_buflens);
+}
+
+/*
+ * shrink @segment to size @newlen. if @move_data is non-zero, we also move
+ * data forward from @segment + 1.
+ * 
+ * if @newlen == 0, we remove the segment completely, but we still keep the
+ * totally bufcount the same to save possible data moving. this will leave a
+ * unused segment with size 0 at the tail, but that's ok.
+ *
+ * CAUTION:
+ * + if any buffers higher than @segment has been filled in, must call shrink
+ *   with non-zero @move_data.
+ * + caller should NOT keep pointers to msg buffers which higher than @segment
+ *   after call shrink.
+ */
+void lustre_shrink_reply(struct ptlrpc_request *req, int segment,
+                        unsigned int newlen, int move_data)
+{
+        switch (req->rq_repmsg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                lustre_shrink_reply_v1(req, segment - 1, newlen, move_data);
+                return;
+        case LUSTRE_MSG_MAGIC_V2:
+                lustre_shrink_reply_v2(req, segment, newlen, move_data);
+                return;
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n",
+                         req->rq_repmsg->lm_magic);
+        }
+}
+
+void lustre_free_reply_state(struct ptlrpc_reply_state *rs)
+{
+        PTLRPC_RS_DEBUG_LRU_DEL(rs);
+
+        LASSERT (atomic_read(&rs->rs_refcount) == 0);
+        LASSERT (!rs->rs_difficult || rs->rs_handled);
+        LASSERT (!rs->rs_on_net);
+        LASSERT (!rs->rs_scheduled);
+        LASSERT (rs->rs_export == NULL);
+        LASSERT (rs->rs_nlocks == 0);
+        LASSERT (list_empty(&rs->rs_exp_list));
+        LASSERT (list_empty(&rs->rs_obd_list));
+
+        if (unlikely(rs->rs_prealloc)) {
+                struct ptlrpc_service *svc = rs->rs_service;
+
+                spin_lock(&svc->srv_lock);
+                list_add(&rs->rs_list,
+                         &svc->srv_free_rs_list);
+                spin_unlock(&svc->srv_lock);
+                cfs_waitq_signal(&svc->srv_free_rs_waitq);
+        } else {
+                OBD_FREE(rs, rs->rs_size);
+        }
+}
+
+int lustre_unpack_msg_v1(void *msg, int len)
+{
+        struct lustre_msg_v1 *m = (struct lustre_msg_v1 *)msg;
+        int flipped, required_len, i;
         ENTRY;
 
-        /* We can provide a slightly better error log, if we check the
-         * message magic and version first.  In the future, struct
-         * lustre_msg may grow, and we'd like to log a version mismatch,
-         * rather than a short message.
-         *
-         */
-        required_len = MAX(offsetof(struct lustre_msg, version) +
-                           sizeof(m->version),
-                           offsetof(struct lustre_msg, magic) +
-                           sizeof(m->magic));
+        /* Now we know the sender speaks my language. */
+        required_len = lustre_msg_hdr_size_v1(0);
         if (len < required_len) {
                 /* can't even look inside the message */
-                CERROR ("message length %d too small for magic/version check\n",
-                        len);
-                RETURN (-EINVAL);
+                CERROR("message length %d too small for lustre_msg\n", len);
+                RETURN(-EINVAL);
         }
 
-        flipped = lustre_msg_swabbed(m);
-        if (flipped)
-                __swab32s(&m->version);
-        else if (m->magic != PTLRPC_MSG_MAGIC) {
-                CERROR("wrong lustre_msg magic %#08x\n", m->magic);
+        flipped = lustre_msg_swabbed((struct lustre_msg *)m);
+
+        if (flipped) {
+                __swab32s(&m->lm_type);
+                __swab32s(&m->lm_version);
+                __swab32s(&m->lm_opc);
+                __swab64s(&m->lm_last_xid);
+                __swab64s(&m->lm_last_committed);
+                __swab64s(&m->lm_transno);
+                __swab32s(&m->lm_status);
+                __swab32s(&m->lm_flags);
+                __swab32s(&m->lm_conn_cnt);
+                __swab32s(&m->lm_bufcount);
+        }
+
+        if (m->lm_version != PTLRPC_MSG_VERSION) {
+                CERROR("wrong lustre_msg version %08x\n", m->lm_version);
+                RETURN(-EINVAL);
+        }
+
+        required_len = lustre_msg_hdr_size_v1(m->lm_bufcount);
+        if (len < required_len) {
+                /* didn't receive all the buffer lengths */
+                CERROR("message length %d too small for %d buflens\n",
+                        len, m->lm_bufcount);
                 RETURN(-EINVAL);
         }
 
-        if ((m->version & ~LUSTRE_VERSION_MASK) != PTLRPC_MSG_VERSION) {
-                CERROR("wrong lustre_msg version %#08x\n", m->version);
+        for (i = 0; i < m->lm_bufcount; i++) {
+                if (flipped)
+                        __swab32s (&m->lm_buflens[i]);
+                required_len += size_round(m->lm_buflens[i]);
+        }
+
+        if (len < required_len) {
+                CERROR("len: %d, required_len %d\n", len, required_len);
+                CERROR("bufcount: %d\n", m->lm_bufcount);
+                for (i = 0; i < m->lm_bufcount; i++)
+                        CERROR("buffer %d length %d\n", i, m->lm_buflens[i]);
                 RETURN(-EINVAL);
         }
 
-        /* Now we know the sender speaks my language (but possibly flipped)...*/
-        required_len = HDR_SIZE(0);
+        RETURN(0);
+}
+
+static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len)
+{
+        int flipped, required_len, i;
+
+        /* Now we know the sender speaks my language. */
+        required_len = lustre_msg_hdr_size_v2(0);
         if (len < required_len) {
                 /* can't even look inside the message */
                 CERROR("message length %d too small for lustre_msg\n", len);
                 RETURN(-EINVAL);
         }
 
+        flipped = lustre_msg_swabbed(m);
+
         if (flipped) {
-                __swab32s(&m->type);
-                __swab32s(&m->opc);
-                __swab64s(&m->last_xid);
-                __swab64s(&m->last_committed);
-                __swab64s(&m->transno);
-                __swab32s(&m->status);
-                __swab32s(&m->bufcount);
-                __swab32s(&m->flags);
+                __swab32s(&m->lm_bufcount);
+                __swab32s(&m->lm_secflvr);
+                __swab32s(&m->lm_repsize);
+                __swab32s(&m->lm_timeout);
+                CLASSERT(offsetof(typeof(*m), lm_padding_1) != 0);
+                CLASSERT(offsetof(typeof(*m), lm_padding_2) != 0);
+                CLASSERT(offsetof(typeof(*m), lm_padding_3) != 0);
         }
 
-        required_len = HDR_SIZE(m->bufcount);
-
+        required_len = lustre_msg_hdr_size_v2(m->lm_bufcount);
         if (len < required_len) {
                 /* didn't receive all the buffer lengths */
                 CERROR ("message length %d too small for %d buflens\n",
-                        len, m->bufcount);
-                RETURN(-EINVAL);
+                        len, m->lm_bufcount);
+                return -EINVAL;
         }
 
-        for (i = 0; i < m->bufcount; i++) {
+        for (i = 0; i < m->lm_bufcount; i++) {
                 if (flipped)
-                        __swab32s (&m->buflens[i]);
-                required_len += size_round(m->buflens[i]);
+                        __swab32s(&m->lm_buflens[i]);
+                required_len += size_round(m->lm_buflens[i]);
         }
 
         if (len < required_len) {
                 CERROR("len: %d, required_len %d\n", len, required_len);
-                CERROR("bufcount: %d\n", m->bufcount);
-                for (i = 0; i < m->bufcount; i++)
-                        CERROR("buffer %d length %d\n", i, m->buflens[i]);
+                CERROR("bufcount: %d\n", m->lm_bufcount);
+                for (i = 0; i < m->lm_bufcount; i++)
+                        CERROR("buffer %d length %d\n", i, m->lm_buflens[i]);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+int lustre_unpack_msg(struct lustre_msg *m, int len)
+{
+        int required_len, rc;
+        ENTRY;
+
+        /* We can provide a slightly better error log, if we check the
+         * message magic and version first.  In the future, struct
+         * lustre_msg may grow, and we'd like to log a version mismatch,
+         * rather than a short message.
+         *
+         */
+        required_len = offsetof(struct lustre_msg, lm_magic) +
+                       sizeof(m->lm_magic);
+        if (len < required_len) {
+                /* can't even look inside the message */
+                CERROR("message length %d too small for magic/version check\n",
+                       len);
                 RETURN(-EINVAL);
         }
 
-        RETURN(0);
+        switch (m->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                rc = lustre_unpack_msg_v1(m, len);
+                break;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                rc = lustre_unpack_msg_v2(m, len);
+                break;
+        default:
+                CERROR("bad lustre msg magic: %#08X\n", m->lm_magic);
+                return -EINVAL;
+        }
+
+        RETURN(rc);
 }
 
-void *lustre_msg_buf(struct lustre_msg *m, int n, int min_size)
+static inline int lustre_unpack_ptlrpc_body_v2(struct lustre_msg_v2 *m,
+                                               int offset)
 {
-        int i;
-        int offset;
-        int buflen;
-        int bufcount;
+        struct ptlrpc_body *pb;
 
-        LASSERT (m != NULL);
-        LASSERT (n >= 0);
+        pb = lustre_swab_buf(m, offset, sizeof(*pb), lustre_swab_ptlrpc_body);
+        if (!pb) {
+                CERROR("error unpacking ptlrpc body");
+                return -EFAULT;
+        }
 
-        bufcount = m->bufcount;
-        if (n >= bufcount) {
-                CDEBUG(D_INFO, "msg %p buffer[%d] not present (count %d)\n",
-                       m, n, bufcount);
-                return NULL;
+        if ((pb->pb_version & ~LUSTRE_VERSION_MASK) != PTLRPC_MSG_VERSION) {
+                 CERROR("wrong lustre_msg version %08x\n", pb->pb_version);
+                 return -EINVAL;
+         }
+
+        return 0;
+}
+
+int lustre_unpack_req_ptlrpc_body(struct ptlrpc_request *req, int offset)
+{
+        switch (req->rq_reqmsg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return 0;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                lustre_set_req_swabbed(req, offset);
+                return lustre_unpack_ptlrpc_body_v2(req->rq_reqmsg, offset);
+        default:
+                CERROR("bad lustre msg magic: %#08X\n",
+                       req->rq_reqmsg->lm_magic);
+                return -EINVAL;
+        }
+}
+
+int lustre_unpack_rep_ptlrpc_body(struct ptlrpc_request *req, int offset)
+{
+        switch (req->rq_repmsg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return 0;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                lustre_set_rep_swabbed(req, offset);
+                return lustre_unpack_ptlrpc_body_v2(req->rq_repmsg, offset);
+        default:
+                CERROR("bad lustre msg magic: %#08X\n",
+                       req->rq_repmsg->lm_magic);
+                return -EINVAL;
         }
+}
+
+static inline int lustre_msg_buflen_v1(void *msg, int n)
+{
+        struct lustre_msg_v1 *m = (struct lustre_msg_v1 *)msg;
+
+        LASSERT(n >= 0);
+        if (n >= m->lm_bufcount)
+                return 0;
+
+        return m->lm_buflens[n];
+}
+
+static inline int lustre_msg_buflen_v2(struct lustre_msg_v2 *m, int n)
+{
+        if (n >= m->lm_bufcount)
+                return 0;
+
+        return m->lm_buflens[n];
+}
+
+/**
+ * lustre_msg_buflen - return the length of buffer @n in message @m
+ * @m - lustre_msg (request or reply) to look at
+ * @n - message index (base 0)
+ *
+ * returns zero for non-existent message indices
+ */
+int lustre_msg_buflen(struct lustre_msg *m, int n)
+{
+        switch (m->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return lustre_msg_buflen_v1(m, n - 1);
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                return lustre_msg_buflen_v2(m, n);
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", m->lm_magic);
+                return -EINVAL;
+        }
+}
+EXPORT_SYMBOL(lustre_msg_buflen);
+
+static inline void lustre_msg_set_buflen_v1(void *msg, int n, int len)
+{
+        struct lustre_msg_v1 *m = (struct lustre_msg_v1 *)msg;
+
+        LASSERT(n >= 0);
+        if (n >= m->lm_bufcount)
+                LBUG();
+
+        m->lm_buflens[n] = len;
+}
+
+static inline void
+lustre_msg_set_buflen_v2(struct lustre_msg_v2 *m, int n, int len)
+{
+        if (n >= m->lm_bufcount)
+                LBUG();
+
+        m->lm_buflens[n] = len;
+}
 
-        buflen = m->buflens[n];
-        if (buflen < min_size) {
-                CERROR("msg %p buffer[%d] size %d too small (required %d)\n",
-                       m, n, buflen, min_size);
-                return NULL;
+void lustre_msg_set_buflen(struct lustre_msg *m, int n, int len)
+{
+        switch (m->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                lustre_msg_set_buflen_v1(m, n - 1, len);
+                return;
+        case LUSTRE_MSG_MAGIC_V2:
+                lustre_msg_set_buflen_v2(m, n, len);
+                return;
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", m->lm_magic);
         }
+}
 
-        offset = HDR_SIZE(bufcount);
-        for (i = 0; i < n; i++)
-                offset += size_round(m->buflens[i]);
+EXPORT_SYMBOL(lustre_msg_set_buflen);
 
-        return (char *)m + offset;
+/* NB return the bufcount for lustre_msg_v2 format, so if message is packed
+ * in V1 format, the result is one bigger. (add struct ptlrpc_body). */
+int lustre_msg_bufcount(struct lustre_msg *m)
+{
+        switch (m->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)m)->lm_bufcount + 1;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                return m->lm_bufcount;
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", m->lm_magic);
+                return -EINVAL;
+        }
 }
+EXPORT_SYMBOL(lustre_msg_bufcount);
 
 char *lustre_msg_string(struct lustre_msg *m, int index, int max_len)
 {
         /* max_len == 0 means the string should fill the buffer */
-        char *str = lustre_msg_buf(m, index, 0);
-        int   slen;
-        int   blen;
+        char *str;
+        int slen, blen;
+
+        switch (m->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                str = lustre_msg_buf_v1(m, index - 1, 0);
+                blen = lustre_msg_buflen_v1(m, index - 1);
+                break;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                str = lustre_msg_buf_v2(m, index, 0);
+                blen = lustre_msg_buflen_v2(m, index);
+                break;
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", m->lm_magic);
+        }
 
         if (str == NULL) {
                 CERROR ("can't unpack string in msg %p buffer[%d]\n", m, index);
-                return (NULL);
+                return NULL;
         }
 
-        blen = m->buflens[index];
         slen = strnlen(str, blen);
 
         if (slen == blen) {                     /* not NULL terminated */
-                CERROR ("can't unpack non-NULL terminated string in "
+                CERROR("can't unpack non-NULL terminated string in "
                         "msg %p buffer[%d] len %d\n", m, index, blen);
-                return (NULL);
+                return NULL;
         }
 
         if (max_len == 0) {
                 if (slen != blen - 1) {
-                        CERROR ("can't unpack short string in msg %p "
-                                "buffer[%d] len %d: strlen %d\n",
-                                m, index, blen, slen);
-                        return (NULL);
+                        CERROR("can't unpack short string in msg %p "
+                               "buffer[%d] len %d: strlen %d\n",
+                               m, index, blen, slen);
+                        return NULL;
                 }
         } else if (slen > max_len) {
-                CERROR ("can't unpack oversized string in msg %p "
-                        "buffer[%d] len %d strlen %d: max %d expected\n",
-                        m, index, blen, slen, max_len);
-                return (NULL);
+                CERROR("can't unpack oversized string in msg %p "
+                       "buffer[%d] len %d strlen %d: max %d expected\n",
+                       m, index, blen, slen, max_len);
+                return NULL;
         }
 
-        return (str);
+        return str;
 }
 
 /* Wrap up the normal fixed length cases */
@@ -395,7 +991,18 @@ void *lustre_swab_buf(struct lustre_msg *msg, int index, int min_size,
 {
         void *ptr;
 
-        ptr = lustre_msg_buf(msg, index, min_size);
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                ptr = lustre_msg_buf_v1(msg, index - 1, min_size);
+                break;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                ptr = lustre_msg_buf_v2(msg, index, min_size);
+                break;
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
         if (ptr == NULL)
                 return NULL;
 
@@ -419,541 +1026,970 @@ void *lustre_swab_repbuf(struct ptlrpc_request *req, int index, int min_size,
         return lustre_swab_buf(req->rq_repmsg, index, min_size, swabber);
 }
 
-/* byte flipping routines for all wire types declared in
- * lustre_idl.h implemented here.
- */
+__u32 lustre_msg_get_flags(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_flags &
+                       MSG_GEN_FLAG_MASK;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_flags;
+        }
+        default:
+                /* flags might be printed in debug code while message
+                 * uninitialized */
+                return 0;
+        }
+}
 
-void lustre_swab_connect(struct obd_connect_data *ocd)
+void lustre_msg_add_flags(struct lustre_msg *msg, int flags)
 {
-        __swab64s(&ocd->ocd_connect_flags);
-        __swab32s(&ocd->ocd_nllu[0]);
-        __swab32s(&ocd->ocd_nllu[1]);
-}
-
-void lustre_swab_obdo(struct obdo *o)
-{
-        __swab64s(&o->o_id);
-        __swab64s(&o->o_gr);
-        __swab64s(&o->o_atime);
-        __swab64s(&o->o_mtime);
-        __swab64s(&o->o_ctime);
-        __swab64s(&o->o_size);
-        __swab64s(&o->o_blocks);
-        __swab64s(&o->o_grant);
-        __swab32s(&o->o_blksize);
-        __swab32s(&o->o_mode);
-        __swab32s(&o->o_uid);
-        __swab32s(&o->o_gid);
-        __swab32s(&o->o_flags);
-        __swab32s(&o->o_nlink);
-        __swab32s(&o->o_generation);
-        __swab64s(&o->o_valid);
-        __swab32s(&o->o_misc);
-        __swab32s(&o->o_easize);
-        __swab32s(&o->o_mds);
-        __swab64s(&o->o_fid);
-        /* o_inline is opaque */
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_flags |=
+                                        MSG_GEN_FLAG_MASK & flags;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_flags |= flags;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
 }
 
-/* mdc pack methods used by mdc and smfs*/
-void *mdc_create_pack(struct lustre_msg *msg, int offset,
-                      struct mdc_op_data *op_data, __u32 mode,
-                      __u64 rdev, const void *data, int datalen)
+void lustre_msg_set_flags(struct lustre_msg *msg, int flags)
 {
-        struct mds_rec_create *rec;
-        char *tmp;
-        rec = lustre_msg_buf(msg, offset, sizeof (*rec));
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_flags &= ~MSG_GEN_FLAG_MASK;
+                ((struct lustre_msg_v1 *)msg)->lm_flags |=
+                                        MSG_GEN_FLAG_MASK & flags;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
 
-        rec->cr_opcode = REINT_CREATE;
-        rec->cr_id = op_data->id1;
-        rec->cr_replayid = op_data->id2;
-        rec->cr_mode = mode;
-        rec->cr_rdev = rdev;
-        rec->cr_flags = op_data->flags;
-        rec->cr_time = op_data->mod_time;
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_flags = flags;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
+}
 
-        tmp = lustre_msg_buf(msg, offset + 1, op_data->namelen + 1);
-        LOGL0(op_data->name, op_data->namelen, tmp);
+void lustre_msg_clear_flags(struct lustre_msg *msg, int flags)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                ((struct lustre_msg_v1 *)msg)->lm_flags &=
+                                        ~(MSG_GEN_FLAG_MASK & flags);
+                return;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
 
-        if (data) {
-                tmp = lustre_msg_buf(msg, offset + 2, datalen);
-                memcpy (tmp, data, datalen);
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_flags &= ~(MSG_GEN_FLAG_MASK & flags);
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
         }
-        return ((void*)tmp + size_round(datalen));
 }
 
-__u32 mds_pack_open_flags(__u32 flags)
+__u32 lustre_msg_get_op_flags(struct lustre_msg *msg)
 {
-        return
-                (flags & (FMODE_READ | FMODE_WRITE | FMODE_EXEC |
-                          MDS_OPEN_DELAY_CREATE | MDS_OPEN_HAS_EA |
-                          MDS_OPEN_HAS_OBJS)) |
-                ((flags & O_CREAT) ? MDS_OPEN_CREAT : 0) |
-                ((flags & O_EXCL) ? MDS_OPEN_EXCL : 0) |
-                ((flags & O_TRUNC) ? MDS_OPEN_TRUNC : 0) |
-                ((flags & O_APPEND) ? MDS_OPEN_APPEND : 0) |
-                ((flags & O_SYNC) ? MDS_OPEN_SYNC : 0) |
-                ((flags & O_DIRECTORY) ? MDS_OPEN_DIRECTORY : 0) |
-                0;
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_flags >>
+                       MSG_OP_FLAG_SHIFT;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_op_flags;
+        }
+        default:
+                return 0;
+        }
 }
 
-void *mdc_setattr_pack(struct lustre_msg *msg, int offset,
-                       struct mdc_op_data *op_data, struct iattr *iattr,
-                       void *ea, int ealen, void *ea2, int ea2len, 
-                       void *ea3, int ea3len)
+void lustre_msg_add_op_flags(struct lustre_msg *msg, int flags)
 {
-        struct mds_rec_setattr *rec = lustre_msg_buf(msg, offset, sizeof(*rec));
-        char *tmp = NULL;
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_flags |=
+                        (flags & MSG_GEN_FLAG_MASK) << MSG_OP_FLAG_SHIFT;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_op_flags |= flags;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
+}
 
-        rec->sa_opcode = REINT_SETATTR;
-        rec->sa_flags = op_data->flags;
-        rec->sa_id = op_data->id1;
+void lustre_msg_set_op_flags(struct lustre_msg *msg, int flags)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_flags &= ~MSG_OP_FLAG_MASK;
+                ((struct lustre_msg_v1 *)msg)->lm_flags |=
+                        ((flags & MSG_GEN_FLAG_MASK) <<MSG_OP_FLAG_SHIFT);
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
 
-        if (iattr) {
-                rec->sa_valid = iattr->ia_valid;
-                rec->sa_mode = iattr->ia_mode;
-                rec->sa_uid = iattr->ia_uid;
-                rec->sa_gid = iattr->ia_gid;
-                rec->sa_size = iattr->ia_size;
-                rec->sa_atime = LTIME_S(iattr->ia_atime);
-                rec->sa_mtime = LTIME_S(iattr->ia_mtime);
-                rec->sa_ctime = LTIME_S(iattr->ia_ctime);
-                rec->sa_attr_flags = iattr->ia_attr_flags;
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_op_flags |= flags;
+                return;
         }
-        tmp = (char*)rec + size_round(sizeof(*rec));
-                
-        if (ealen == 0)
-                return (void*)tmp;
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
+}
 
-        memcpy(lustre_msg_buf(msg, offset + 1, ealen), ea, ealen);
-        tmp += size_round(ealen);
+struct lustre_handle *lustre_msg_get_handle(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return &((struct lustre_msg_v1 *)msg)->lm_handle;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return &pb->pb_handle;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return NULL;
+        }
+}
 
-        if (ea2len == 0)
-                return (void*)tmp;
+__u32 lustre_msg_get_type(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_type;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_type;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
+}
 
-        memcpy(lustre_msg_buf(msg, offset + 2, ea2len), ea2, ea2len);
-        tmp += size_round(ea2len);
+__u32 lustre_msg_get_version(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_version;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_version;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
+}
 
-        if (ea3len == 0)
-                return (void*)tmp;
+void lustre_msg_add_version(struct lustre_msg *msg, int version)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
 
-        memcpy(lustre_msg_buf(msg, offset + 3, ea3len), ea3, ea3len);
-        tmp += size_round(ea3len);
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_version |= version;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
+}
 
-        return (void*)tmp;
+__u32 lustre_msg_get_opc(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_opc;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_opc;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
 }
 
-void *mdc_unlink_pack(struct lustre_msg *msg, int offset,
-                      struct mdc_op_data *op_data)
+__u64 lustre_msg_get_last_xid(struct lustre_msg *msg)
 {
-        struct mds_rec_unlink *rec;
-        char *tmp;
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_last_xid;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_last_xid;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
+}
 
-        rec = lustre_msg_buf(msg, offset, sizeof (*rec));
-        LASSERT (rec != NULL);
+__u64 lustre_msg_get_last_committed(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_last_committed;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_last_committed;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
+}
 
-        rec->ul_opcode = REINT_UNLINK;
-        rec->ul_mode = op_data->create_mode;
-        rec->ul_id1 = op_data->id1;
-        rec->ul_id2 = op_data->id2;
-        rec->ul_time = op_data->mod_time;
-        rec->ul_flags = op_data->flags;
+__u64 lustre_msg_get_transno(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_transno;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_transno;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
+}
 
-        tmp = lustre_msg_buf(msg, offset + 1, op_data->namelen + 1);
-        LASSERT (tmp != NULL);
-        LOGL0(op_data->name, op_data->namelen, tmp);
-        return (void*)tmp;  
+__u32 lustre_msg_get_status(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_status;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_status;
+        }
+        default:
+                /* status might be printed in debug code while message
+                 * uninitialized */
+                return 0;
+        }
 }
 
-void *mdc_link_pack(struct lustre_msg *msg, int offset,
-                    struct mdc_op_data *op_data)
+__u32 lustre_msg_get_conn_cnt(struct lustre_msg *msg)
 {
-        struct mds_rec_link *rec;
-        char *tmp;
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return ((struct lustre_msg_v1 *)msg)->lm_conn_cnt;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                return pb->pb_conn_cnt;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
+}
 
-        rec = lustre_msg_buf(msg, offset, sizeof (*rec));
+__u32 lustre_msg_get_magic(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                return msg->lm_magic;
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
+}
 
-        rec->lk_opcode = REINT_LINK;
-        rec->lk_id1 = op_data->id1;
-        rec->lk_id2 = op_data->id2;
-        rec->lk_flags = op_data->flags;
-        rec->lk_time = op_data->mod_time;
+void lustre_msg_set_handle(struct lustre_msg *msg, struct lustre_handle *handle)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_handle = *handle;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
 
-        tmp = lustre_msg_buf(msg, offset + 1, op_data->namelen + 1);
-        LOGL0(op_data->name, op_data->namelen, tmp);
-        
-        return (void*)tmp; 
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_handle = *handle;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
 }
 
-void *mdc_rename_pack(struct lustre_msg *msg, int offset,
-                      struct mdc_op_data *op_data,
-                      const char *old, int oldlen,
-                      const char *new, int newlen)
+void lustre_msg_set_type(struct lustre_msg *msg, __u32 type)
 {
-        struct mds_rec_rename *rec;
-        char *tmp;
-
-        rec = lustre_msg_buf(msg, offset, sizeof (*rec));
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_type = type;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
 
-        /* XXX do something about time, uid, gid */
-        rec->rn_opcode = REINT_RENAME;
-        rec->rn_id1 = op_data->id1;
-        rec->rn_id2 = op_data->id2;
-        rec->rn_flags = op_data->flags;
-        rec->rn_time = op_data->mod_time;
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_type = type;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
+}
 
-        tmp = lustre_msg_buf(msg, offset + 1, oldlen + 1);
-        LOGL0(old, oldlen, tmp);
+void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_opc = opc;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
 
-        if (new) {
-                tmp = lustre_msg_buf(msg, offset + 2, newlen + 1);
-                LOGL0(new, newlen, tmp);
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_opc = opc;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
         }
-        return (void*)tmp;
 }
 
-void lustre_swab_obd_statfs(struct obd_statfs *os)
+void lustre_msg_set_last_xid(struct lustre_msg *msg, __u64 last_xid)
 {
-        __swab64s(&os->os_type);
-        __swab64s(&os->os_blocks);
-        __swab64s(&os->os_bfree);
-        __swab64s(&os->os_bavail);
-        __swab64s(&os->os_ffree);
-        /* no need to swap os_fsid */
-        __swab32s(&os->os_bsize);
-        __swab32s(&os->os_namelen);
-        /* no need to swap os_spare */
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_last_xid = last_xid;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_last_xid = last_xid;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
 }
 
-void lustre_swab_obd_ioobj(struct obd_ioobj *ioo)
+void lustre_msg_set_last_committed(struct lustre_msg *msg, __u64 last_committed)
 {
-        __swab64s(&ioo->ioo_id);
-        __swab64s(&ioo->ioo_gr);
-        __swab32s(&ioo->ioo_type);
-        __swab32s(&ioo->ioo_bufcnt);
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_last_committed=last_committed;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_last_committed = last_committed;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
 }
 
-void lustre_swab_niobuf_remote(struct niobuf_remote *nbr)
+void lustre_msg_set_transno(struct lustre_msg *msg, __u64 transno)
 {
-        __swab64s(&nbr->offset);
-        __swab32s(&nbr->len);
-        __swab32s(&nbr->flags);
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_transno = transno;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_transno = transno;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
 }
 
-void lustre_swab_ost_body(struct ost_body *b)
+void lustre_msg_set_status(struct lustre_msg *msg, __u32 status)
 {
-        lustre_swab_obdo(&b->oa);
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_status = status;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_status = status;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
 }
 
-void lustre_swab_ost_last_id(obd_id *id)
+void lustre_msg_set_conn_cnt(struct lustre_msg *msg, __u32 conn_cnt)
 {
-        __swab64s(id);
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+                ((struct lustre_msg_v1 *)msg)->lm_conn_cnt = conn_cnt;
+                return;
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb;
+
+                pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_conn_cnt = conn_cnt;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
 }
 
-void lustre_swab_generic_32s(__u32 *val)
+/* byte flipping routines for all wire types declared in
+ * lustre_idl.h implemented here.
+ */
+void lustre_swab_ptlrpc_body(struct ptlrpc_body *b)
 {
-        __swab32s(val);
+        __swab32s (&b->pb_type);
+        __swab32s (&b->pb_version);
+        __swab32s (&b->pb_opc);
+        __swab32s (&b->pb_status);
+        __swab64s (&b->pb_last_xid);
+        __swab64s (&b->pb_last_seen);
+        __swab64s (&b->pb_last_committed);
+        __swab64s (&b->pb_transno);
+        __swab32s (&b->pb_flags);
+        __swab32s (&b->pb_op_flags);
+        __swab32s (&b->pb_conn_cnt);
+        CLASSERT(offsetof(typeof(*b), pb_padding_1) != 0);
+        CLASSERT(offsetof(typeof(*b), pb_padding_2) != 0);
+        CLASSERT(offsetof(typeof(*b), pb_padding_3) != 0);
+        CLASSERT(offsetof(typeof(*b), pb_padding_4) != 0);
+        CLASSERT(offsetof(typeof(*b), pb_padding_5) != 0);
 }
 
-void lustre_swab_ost_lvb(struct ost_lvb *lvb)
+void lustre_swab_connect(struct obd_connect_data *ocd)
 {
-        __swab64s(&lvb->lvb_size);
-        __swab64s(&lvb->lvb_mtime);
-        __swab64s(&lvb->lvb_atime);
-        __swab64s(&lvb->lvb_ctime);
-        __swab64s(&lvb->lvb_blocks);
+        __swab64s(&ocd->ocd_connect_flags);
+        __swab32s(&ocd->ocd_version);
+        __swab32s(&ocd->ocd_grant);
+        __swab32s(&ocd->ocd_index);
+        __swab32s(&ocd->ocd_brw_size);
+        __swab64s(&ocd->ocd_ibits_known);
+        __swab32s(&ocd->ocd_nllu);
+        __swab32s(&ocd->ocd_nllg);
+        CLASSERT(offsetof(typeof(*ocd), padding1) != 0);
+        CLASSERT(offsetof(typeof(*ocd), padding2) != 0);
+        CLASSERT(offsetof(typeof(*ocd), padding3) != 0);
+        CLASSERT(offsetof(typeof(*ocd), padding4) != 0);
 }
 
-void lustre_swab_lustre_stc (struct lustre_stc *stc)
+void lustre_swab_obdo (struct obdo  *o)
 {
-        __swab64s(&stc->u.e3s.l3s_ino);
-        __swab32s(&stc->u.e3s.l3s_gen);
-        __swab32s(&stc->u.e3s.l3s_type);
+        __swab64s (&o->o_valid);
+        __swab64s (&o->o_id);
+        __swab64s (&o->o_gr);
+        __swab64s (&o->o_fid);
+        __swab64s (&o->o_size);
+        __swab64s (&o->o_mtime);
+        __swab64s (&o->o_atime);
+        __swab64s (&o->o_ctime);
+        __swab64s (&o->o_blocks);
+        __swab64s (&o->o_grant);
+        __swab32s (&o->o_blksize);
+        __swab32s (&o->o_mode);
+        __swab32s (&o->o_uid);
+        __swab32s (&o->o_gid);
+        __swab32s (&o->o_flags);
+        __swab32s (&o->o_nlink);
+        __swab32s (&o->o_generation);
+        __swab32s (&o->o_misc);
+        __swab32s (&o->o_easize);
+        __swab32s (&o->o_mds);
+        __swab32s (&o->o_stripe_idx);
+        __swab32s (&o->o_padding_1);
+        /* o_inline is opaque */
 }
 
-void lustre_swab_lustre_fid(struct lustre_fid *fid)
+void lustre_swab_obd_statfs (struct obd_statfs *os)
 {
-        __swab64s(&fid->lf_id);
-        __swab64s(&fid->lf_group);
-        /*__swab32s (&fid->lf_version);*/
+        __swab64s (&os->os_type);
+        __swab64s (&os->os_blocks);
+        __swab64s (&os->os_bfree);
+        __swab64s (&os->os_bavail);
+        __swab64s (&os->os_files);
+        __swab64s (&os->os_ffree);
+        /* no need to swab os_fsid */
+        __swab32s (&os->os_bsize);
+        __swab32s (&os->os_namelen);
+        __swab64s (&os->os_maxbytes);
+        __swab32s (&os->os_state);
+        /* no need to swap os_spare */
 }
 
-void lustre_swab_lustre_id(struct lustre_id *id)
+void lustre_swab_obd_ioobj (struct obd_ioobj *ioo)
 {
-        lustre_swab_lustre_stc(&id->li_stc);
-        lustre_swab_lustre_fid(&id->li_fid);
+        __swab64s (&ioo->ioo_id);
+        __swab64s (&ioo->ioo_gr);
+        __swab32s (&ioo->ioo_type);
+        __swab32s (&ioo->ioo_bufcnt);
 }
 
-void lustre_swab_parseid_pkg (struct parseid_pkg *pkg)
+void lustre_swab_niobuf_remote (struct niobuf_remote *nbr)
 {
-        __swab32s(&pkg->pp_type);
-        __swab32s(&pkg->pp_rc);
-        lustre_swab_lustre_id(&pkg->pp_id1);
-        lustre_swab_lustre_id(&pkg->pp_id2);
+        __swab64s (&nbr->offset);
+        __swab32s (&nbr->len);
+        __swab32s (&nbr->flags);
 }
 
-void lustre_swab_mds_status_req(struct mds_status_req *r)
+void lustre_swab_ost_body (struct ost_body *b)
 {
-        __swab32s(&r->flags);
-        __swab32s(&r->repbuf);
+        lustre_swab_obdo (&b->oa);
 }
 
-/* 
- * because sec_desc is variable buffer, we must check it by hand
- */
-struct mds_req_sec_desc *lustre_swab_mds_secdesc(struct ptlrpc_request *req,
-                                                 int offset)
+void lustre_swab_ost_last_id(obd_id *id)
 {
-        struct mds_req_sec_desc *rsd;
-        struct lustre_msg *m;
-        __u32 i;
+        __swab64s(id);
+}
 
-        LASSERT_REQSWAB(req, offset);
+void lustre_swab_ost_lvb(struct ost_lvb *lvb)
+{
+        __swab64s(&lvb->lvb_size);
+        __swab64s(&lvb->lvb_mtime);
+        __swab64s(&lvb->lvb_atime);
+        __swab64s(&lvb->lvb_ctime);
+        __swab64s(&lvb->lvb_blocks);
+}
 
-        m = req->rq_reqmsg;
-        rsd = lustre_msg_buf(m, offset, sizeof(*rsd));
-        if (!rsd)
-                return NULL;
+void lustre_swab_mds_status_req (struct mds_status_req *r)
+{
+        __swab32s (&r->flags);
+        __swab32s (&r->repbuf);
+}
 
-        if (lustre_msg_swabbed(m)) {
-                __swab32s(&rsd->rsd_uid);
-                __swab32s(&rsd->rsd_gid);
-                __swab32s(&rsd->rsd_fsuid);
-                __swab32s(&rsd->rsd_fsgid);
-                __swab32s(&rsd->rsd_cap);
-                __swab32s(&rsd->rsd_ngroups);
-        }
+void lustre_swab_mds_body (struct mds_body *b)
+{
+        lustre_swab_ll_fid (&b->fid1);
+        lustre_swab_ll_fid (&b->fid2);
+        /* handle is opaque */
+        __swab64s (&b->valid);
+        __swab64s (&b->size);
+        __swab64s (&b->mtime);
+        __swab64s (&b->atime);
+        __swab64s (&b->ctime);
+        __swab64s (&b->blocks);
+        __swab64s (&b->io_epoch);
+        __swab64s (&b->ino);
+        __swab32s (&b->fsuid);
+        __swab32s (&b->fsgid);
+        __swab32s (&b->capability);
+        __swab32s (&b->mode);
+        __swab32s (&b->uid);
+        __swab32s (&b->gid);
+        __swab32s (&b->flags);
+        __swab32s (&b->rdev);
+        __swab32s (&b->nlink);
+        __swab32s (&b->generation);
+        __swab32s (&b->suppgid);
+        __swab32s (&b->eadatasize);
+        __swab32s (&b->aclsize);
+        __swab32s (&b->max_mdsize);
+        __swab32s (&b->max_cookiesize);
+        __swab32s (&b->padding_4);
+}
 
-        if (rsd->rsd_ngroups > LUSTRE_MAX_GROUPS) {
-                CERROR("%u groups is not allowed\n", rsd->rsd_ngroups);
-                return NULL;
-        }
+void lustre_swab_mgs_target_info(struct mgs_target_info *mti)
+{
+        int i;
+        __swab32s(&mti->mti_lustre_ver);
+        __swab32s(&mti->mti_stripe_index);
+        __swab32s(&mti->mti_config_ver);
+        __swab32s(&mti->mti_flags);
+        __swab32s(&mti->mti_nid_count);
+        CLASSERT(sizeof(lnet_nid_t) == sizeof(__u64));
+        for (i = 0; i < MTI_NIDS_MAX; i++) 
+                __swab64s(&mti->mti_nids[i]);
+}
 
-        if (m->buflens[offset] !=
-            sizeof(*rsd) + rsd->rsd_ngroups * sizeof(__u32)) {
-                CERROR("bufflen %u while contains %u groups\n",
-                        m->buflens[offset], rsd->rsd_ngroups);
-                return NULL;
-        }
+static void lustre_swab_obd_dqinfo (struct obd_dqinfo *i)
+{
+        __swab64s (&i->dqi_bgrace);
+        __swab64s (&i->dqi_igrace);
+        __swab32s (&i->dqi_flags);
+        __swab32s (&i->dqi_valid);
+}
 
-        if (lustre_msg_swabbed(m)) {
-                for (i = 0; i < rsd->rsd_ngroups; i++)
-                        __swab32s(&rsd->rsd_groups[i]);
-        }
+static void lustre_swab_obd_dqblk (struct obd_dqblk *b)
+{
+        __swab64s (&b->dqb_ihardlimit);
+        __swab64s (&b->dqb_isoftlimit);
+        __swab64s (&b->dqb_curinodes);
+        __swab64s (&b->dqb_bhardlimit);
+        __swab64s (&b->dqb_bsoftlimit);
+        __swab64s (&b->dqb_curspace);
+        __swab64s (&b->dqb_btime);
+        __swab64s (&b->dqb_itime);
+        __swab32s (&b->dqb_valid);
+        CLASSERT(offsetof(typeof(*b), padding) != 0);
+}
 
-        return rsd;
+void lustre_swab_obd_quotactl (struct obd_quotactl *q)
+{
+        __swab32s (&q->qc_cmd);
+        __swab32s (&q->qc_type);
+        __swab32s (&q->qc_id);
+        __swab32s (&q->qc_stat);
+        lustre_swab_obd_dqinfo (&q->qc_dqinfo);
+        lustre_swab_obd_dqblk (&q->qc_dqblk);
 }
 
-void lustre_swab_mds_body(struct mds_body *b)
+void lustre_swab_mds_rec_setattr (struct mds_rec_setattr *sa)
 {
-        lustre_swab_lustre_id(&b->id1);
-        lustre_swab_lustre_id(&b->id2);
-        /* handle is opaque */
-        __swab64s(&b->size);
-        __swab64s(&b->blocks);
-        __swab64s(&b->valid);
-        __swab64s (&b->audit);
-        __swab32s(&b->mode);
-        __swab32s(&b->uid);
-        __swab32s(&b->gid);
-        __swab32s(&b->mtime);
-        __swab32s(&b->ctime);
-        __swab32s(&b->atime);
-        __swab32s(&b->flags);
-        __swab32s(&b->rdev);
-        __swab32s(&b->nlink);
-        __swab32s(&b->eadatasize);
-}
-void lustre_swab_mds_rec_setattr(struct mds_rec_setattr *sa)
-{
-        __swab32s(&sa->sa_opcode);
-        __swab32s(&sa->sa_flags);
-        __swab32s(&sa->sa_valid);
-        lustre_swab_lustre_id(&sa->sa_id);
-        __swab32s(&sa->sa_mode);
-        __swab32s(&sa->sa_uid);
-        __swab32s(&sa->sa_gid);
-        __swab32s(&sa->sa_attr_flags);
-        __swab64s(&sa->sa_size);
-        __swab64s(&sa->sa_atime);
-        __swab64s(&sa->sa_mtime);
-        __swab64s(&sa->sa_ctime);
-}
-
-void lustre_swab_mds_rec_create(struct mds_rec_create *cr)
-{
-        __swab32s(&cr->cr_opcode);
-        __swab32s(&cr->cr_flags);
-        __swab32s(&cr->cr_mode);
-        lustre_swab_lustre_id(&cr->cr_id);
-        lustre_swab_lustre_id(&cr->cr_replayid);
-        __swab64s(&cr->cr_time);
-        __swab64s(&cr->cr_rdev);
-        __swab64s(&cr->cr_ioepoch);
-}
-
-void lustre_swab_mds_rec_link(struct mds_rec_link *lk)
-{
-        __swab32s(&lk->lk_opcode);
-        __swab32s(&lk->lk_flags);
-        lustre_swab_lustre_id(&lk->lk_id1);
-        lustre_swab_lustre_id(&lk->lk_id2);
-}
-
-void lustre_swab_mds_rec_unlink(struct mds_rec_unlink *ul)
-{
-        __swab32s(&ul->ul_opcode);
-        __swab32s(&ul->ul_flags);
-        __swab32s(&ul->ul_mode);
-        lustre_swab_lustre_id(&ul->ul_id1);
-        lustre_swab_lustre_id(&ul->ul_id2);
+        __swab32s (&sa->sa_opcode);
+        __swab32s (&sa->sa_fsuid);
+        __swab32s (&sa->sa_fsgid);
+        __swab32s (&sa->sa_cap);
+        __swab32s (&sa->sa_suppgid);
+        __swab32s (&sa->sa_mode);
+        lustre_swab_ll_fid (&sa->sa_fid);
+        __swab64s (&sa->sa_valid);
+        __swab64s (&sa->sa_size);
+        __swab64s (&sa->sa_mtime);
+        __swab64s (&sa->sa_atime);
+        __swab64s (&sa->sa_ctime);
+        __swab32s (&sa->sa_uid);
+        __swab32s (&sa->sa_gid);
+        __swab32s (&sa->sa_attr_flags);
+        CLASSERT(offsetof(typeof(*sa), sa_padding) != 0);
 }
 
-void lustre_swab_mds_rec_rename (struct mds_rec_rename *rn)
+void lustre_swab_mds_rec_join (struct mds_rec_join *jr)
 {
-        __swab32s(&rn->rn_opcode);
-        __swab32s(&rn->rn_flags);
-        lustre_swab_lustre_id(&rn->rn_id1);
-        lustre_swab_lustre_id(&rn->rn_id2);
+        __swab64s(&jr->jr_headsize);
+        lustre_swab_ll_fid(&jr->jr_fid);
 }
 
-void lustre_swab_lov_desc(struct lov_desc *ld)
+void lustre_swab_mds_rec_create (struct mds_rec_create *cr)
 {
-        __swab32s(&ld->ld_tgt_count);
-        __swab32s(&ld->ld_active_tgt_count);
-        __swab32s(&ld->ld_default_stripe_count);
-        __swab64s(&ld->ld_default_stripe_size);
-        __swab64s(&ld->ld_default_stripe_offset);
-        __swab32s(&ld->ld_pattern);
-        /* uuid endian insensitive */
+        __swab32s (&cr->cr_opcode);
+        __swab32s (&cr->cr_fsuid);
+        __swab32s (&cr->cr_fsgid);
+        __swab32s (&cr->cr_cap);
+        __swab32s (&cr->cr_flags); /* for use with open */
+        __swab32s (&cr->cr_mode);
+        lustre_swab_ll_fid (&cr->cr_fid);
+        lustre_swab_ll_fid (&cr->cr_replayfid);
+        __swab64s (&cr->cr_time);
+        __swab64s (&cr->cr_rdev);
+        __swab32s (&cr->cr_suppgid);
+        CLASSERT(offsetof(typeof(*cr), cr_padding_1) != 0);
+        CLASSERT(offsetof(typeof(*cr), cr_padding_2) != 0);
+        CLASSERT(offsetof(typeof(*cr), cr_padding_3) != 0);
+        CLASSERT(offsetof(typeof(*cr), cr_padding_4) != 0);
+        CLASSERT(offsetof(typeof(*cr), cr_padding_5) != 0);
 }
 
-void lustre_swab_fid_extent(struct fid_extent *ext)
+void lustre_swab_mds_rec_link (struct mds_rec_link *lk)
 {
-        __swab64s(&ext->fe_start);
-        __swab64s(&ext->fe_width);
+        __swab32s (&lk->lk_opcode);
+        __swab32s (&lk->lk_fsuid);
+        __swab32s (&lk->lk_fsgid);
+        __swab32s (&lk->lk_cap);
+        __swab32s (&lk->lk_suppgid1);
+        __swab32s (&lk->lk_suppgid2);
+        lustre_swab_ll_fid (&lk->lk_fid1);
+        lustre_swab_ll_fid (&lk->lk_fid2);
+        __swab64s (&lk->lk_time);
+        CLASSERT(offsetof(typeof(*lk), lk_padding_1) != 0);
+        CLASSERT(offsetof(typeof(*lk), lk_padding_2) != 0);
+        CLASSERT(offsetof(typeof(*lk), lk_padding_3) != 0);
+        CLASSERT(offsetof(typeof(*lk), lk_padding_4) != 0);
 }
 
-void lustre_swab_ldlm_res_id(struct ldlm_res_id *id)
+void lustre_swab_mds_rec_unlink (struct mds_rec_unlink *ul)
 {
-        int  i;
+        __swab32s (&ul->ul_opcode);
+        __swab32s (&ul->ul_fsuid);
+        __swab32s (&ul->ul_fsgid);
+        __swab32s (&ul->ul_cap);
+        __swab32s (&ul->ul_suppgid);
+        __swab32s (&ul->ul_mode);
+        lustre_swab_ll_fid (&ul->ul_fid1);
+        lustre_swab_ll_fid (&ul->ul_fid2);
+        __swab64s (&ul->ul_time);
+        CLASSERT(offsetof(typeof(*ul), ul_padding_1) != 0);
+        CLASSERT(offsetof(typeof(*ul), ul_padding_2) != 0);
+        CLASSERT(offsetof(typeof(*ul), ul_padding_3) != 0);
+        CLASSERT(offsetof(typeof(*ul), ul_padding_4) != 0);
+}
 
-        for (i = 0; i < RES_NAME_SIZE; i++)
-                __swab64s(&id->name[i]);
+void lustre_swab_mds_rec_rename (struct mds_rec_rename *rn)
+{
+        __swab32s (&rn->rn_opcode);
+        __swab32s (&rn->rn_fsuid);
+        __swab32s (&rn->rn_fsgid);
+        __swab32s (&rn->rn_cap);
+        __swab32s (&rn->rn_suppgid1);
+        __swab32s (&rn->rn_suppgid2);
+        lustre_swab_ll_fid (&rn->rn_fid1);
+        lustre_swab_ll_fid (&rn->rn_fid2);
+        __swab64s (&rn->rn_time);
+        CLASSERT(offsetof(typeof(*rn), rn_padding_1) != 0);
+        CLASSERT(offsetof(typeof(*rn), rn_padding_2) != 0);
+        CLASSERT(offsetof(typeof(*rn), rn_padding_3) != 0);
+        CLASSERT(offsetof(typeof(*rn), rn_padding_4) != 0);
 }
 
-void lustre_swab_ldlm_policy_data(ldlm_policy_data_t *d)
+void lustre_swab_lov_desc (struct lov_desc *ld)
 {
-        /* the lock data is a union and the first three fields of both EXTENT
-         * and FLOCK types are __u64, so it's ok to swab them in the same way */
-        __swab64s(&d->l_flock.start);
-        __swab64s(&d->l_flock.end);
-        __swab64s(&d->l_flock.pid);
-        __swab64s(&d->l_flock.nid);
-        __swab64s(&d->l_flock.blocking_pid);
-        __swab64s(&d->l_flock.blocking_nid);
+        __swab32s (&ld->ld_tgt_count);
+        __swab32s (&ld->ld_active_tgt_count);
+        __swab32s (&ld->ld_default_stripe_count);
+        __swab64s (&ld->ld_default_stripe_size);
+        __swab64s (&ld->ld_default_stripe_offset);
+        __swab32s (&ld->ld_pattern);
+        __swab32s (&ld->ld_qos_maxage);
+        /* uuid endian insensitive */
 }
 
-void lustre_swab_ldlm_intent(struct ldlm_intent *i)
+static void print_lum (struct lov_user_md *lum)
 {
-        __swab64s(&i->opc);
+        CDEBUG(D_OTHER, "lov_user_md %p:\n", lum);
+        CDEBUG(D_OTHER, "\tlmm_magic: %#x\n", lum->lmm_magic);
+        CDEBUG(D_OTHER, "\tlmm_pattern: %#x\n", lum->lmm_pattern);
+        CDEBUG(D_OTHER, "\tlmm_object_id: "LPU64"\n", lum->lmm_object_id);
+        CDEBUG(D_OTHER, "\tlmm_object_gr: "LPU64"\n", lum->lmm_object_gr);
+        CDEBUG(D_OTHER, "\tlmm_stripe_size: %#x\n", lum->lmm_stripe_size);
+        CDEBUG(D_OTHER, "\tlmm_stripe_count: %#x\n", lum->lmm_stripe_count);
+        CDEBUG(D_OTHER, "\tlmm_stripe_offset: %#x\n", lum->lmm_stripe_offset);
 }
 
-void lustre_swab_ldlm_resource_desc(struct ldlm_resource_desc *r)
+void lustre_swab_lov_user_md(struct lov_user_md *lum)
 {
-        __swab32s(&r->lr_type);
-        lustre_swab_ldlm_res_id(&r->lr_name);
+        ENTRY;
+        CDEBUG(D_IOCTL, "swabbing lov_user_md\n");
+        __swab32s(&lum->lmm_magic);
+        __swab32s(&lum->lmm_pattern);
+        __swab64s(&lum->lmm_object_id);
+        __swab64s(&lum->lmm_object_gr);
+        __swab32s(&lum->lmm_stripe_size);
+        __swab16s(&lum->lmm_stripe_count);
+        __swab16s(&lum->lmm_stripe_offset);
+        print_lum(lum);
+        EXIT;
 }
 
-void lustre_swab_ldlm_lock_desc(struct ldlm_lock_desc *l)
+static void print_lumj (struct lov_user_md_join *lumj)
 {
-        lustre_swab_ldlm_resource_desc(&l->l_resource);
-        __swab32s(&l->l_req_mode);
-        __swab32s(&l->l_granted_mode);
-        lustre_swab_ldlm_policy_data(&l->l_policy_data);
+        CDEBUG(D_OTHER, "lov_user_md %p:\n", lumj);
+        CDEBUG(D_OTHER, "\tlmm_magic: %#x\n", lumj->lmm_magic);
+        CDEBUG(D_OTHER, "\tlmm_pattern: %#x\n", lumj->lmm_pattern);
+        CDEBUG(D_OTHER, "\tlmm_object_id: "LPU64"\n", lumj->lmm_object_id);
+        CDEBUG(D_OTHER, "\tlmm_object_gr: "LPU64"\n", lumj->lmm_object_gr);
+        CDEBUG(D_OTHER, "\tlmm_stripe_size: %#x\n", lumj->lmm_stripe_size);
+        CDEBUG(D_OTHER, "\tlmm_stripe_count: %#x\n", lumj->lmm_stripe_count);
+        CDEBUG(D_OTHER, "\tlmm_extent_count: %#x\n", lumj->lmm_extent_count);
 }
 
-void lustre_swab_ldlm_request(struct ldlm_request *rq)
+void lustre_swab_lov_user_md_join(struct lov_user_md_join *lumj)
 {
-        __swab32s(&rq->lock_flags);
-        lustre_swab_ldlm_lock_desc(&rq->lock_desc);
-        /* lock_handle1 opaque */
-        /* lock_handle2 opaque */
+        ENTRY;
+        CDEBUG(D_IOCTL, "swabbing lov_user_md_join\n");
+        __swab32s(&lumj->lmm_magic);
+        __swab32s(&lumj->lmm_pattern);
+        __swab64s(&lumj->lmm_object_id);
+        __swab64s(&lumj->lmm_object_gr);
+        __swab32s(&lumj->lmm_stripe_size);
+        __swab32s(&lumj->lmm_stripe_count);
+        __swab32s(&lumj->lmm_extent_count);
+        print_lumj(lumj);
+        EXIT;
 }
 
-void lustre_swab_ldlm_reply(struct ldlm_reply *r)
+static void print_lum_objs(struct lov_user_md *lum)
 {
-        __swab32s(&r->lock_flags);
-        lustre_swab_ldlm_lock_desc(&r->lock_desc);
-        /* lock_handle opaque */
-        __swab64s(&r->lock_policy_res1);
-        __swab64s(&r->lock_policy_res2);
+        struct lov_user_ost_data *lod;
+        int i;
+        ENTRY;
+        if (!(libcfs_debug & D_OTHER)) /* don't loop on nothing */
+                return;
+        CDEBUG(D_OTHER, "lov_user_md_objects: %p\n", lum);
+        for (i = 0; i < lum->lmm_stripe_count; i++) {
+                lod = &lum->lmm_objects[i];
+                CDEBUG(D_OTHER, "(%i) lod->l_object_id: "LPX64"\n", i, lod->l_object_id);
+                CDEBUG(D_OTHER, "(%i) lod->l_object_gr: "LPX64"\n", i, lod->l_object_gr);
+                CDEBUG(D_OTHER, "(%i) lod->l_ost_gen: %#x\n", i, lod->l_ost_gen);
+                CDEBUG(D_OTHER, "(%i) lod->l_ost_idx: %#x\n", i, lod->l_ost_idx);
+        }
+        EXIT;
 }
 
-void lustre_swab_ptlbd_op(struct ptlbd_op *op)
+void lustre_swab_lov_user_md_objects(struct lov_user_md *lum)
 {
-        __swab16s(&op->op_cmd);
-        __swab16s(&op->op_lun);
-        __swab16s(&op->op_niob_cnt);
-        /* ignore op__padding */
-        __swab32s(&op->op_block_cnt);
+        struct lov_user_ost_data *lod;
+        int i;
+        ENTRY;
+        for (i = 0; i < lum->lmm_stripe_count; i++) {
+                lod = &lum->lmm_objects[i];
+                __swab64s(&lod->l_object_id);
+                __swab64s(&lod->l_object_gr);
+                __swab32s(&lod->l_ost_gen);
+                __swab32s(&lod->l_ost_idx);
+        }
+        print_lum_objs(lum);
+        EXIT;
 }
 
-void lustre_swab_ptlbd_niob(struct ptlbd_niob *n)
+void lustre_swab_ldlm_res_id (struct ldlm_res_id *id)
 {
-        __swab64s(&n->n_xid);
-        __swab64s(&n->n_block_nr);
-        __swab32s(&n->n_offset);
-        __swab32s(&n->n_length);
+        int  i;
+
+        for (i = 0; i < RES_NAME_SIZE; i++)
+                __swab64s (&id->name[i]);
 }
 
-void lustre_swab_ptlbd_rsp(struct ptlbd_rsp *r)
+void lustre_swab_ldlm_policy_data (ldlm_policy_data_t *d)
 {
-        __swab16s(&r->r_status);
-        __swab16s(&r->r_error_cnt);
+        /* the lock data is a union and the first two fields are always an
+         * extent so it's ok to process an LDLM_EXTENT and LDLM_FLOCK lock
+         * data the same way. */
+        __swab64s(&d->l_extent.start);
+        __swab64s(&d->l_extent.end);
+        __swab64s(&d->l_extent.gid);
+        __swab32s(&d->l_flock.pid);
 }
 
-void lustre_swab_remote_perm(struct mds_remote_perm *p)
+void lustre_swab_ldlm_intent (struct ldlm_intent *i)
 {
-        __swab32s(&p->mrp_auth_uid);
-        __swab32s(&p->mrp_auth_gid);
-        __swab16s(&p->mrp_perm);
+        __swab64s (&i->opc);
 }
 
-void lustre_swab_lustre_capa(struct lustre_capa *c)
+void lustre_swab_ldlm_resource_desc (struct ldlm_resource_desc *r)
 {
-        __swab32s (&c->lc_uid);
-        __swab32s (&c->lc_ruid);
-        __swab32s (&c->lc_op);
-        __swab32s (&c->lc_igen);
-        __swab64s (&c->lc_ino);
-        __swab32s (&c->lc_mdsid);
-        __swab32s (&c->lc_keyid);
-        __swab64s (&c->lc_expiry);
-        __swab32s (&c->lc_flags);
+        __swab32s (&r->lr_type);
+        CLASSERT(offsetof(typeof(*r), lr_padding) != 0);
+        lustre_swab_ldlm_res_id (&r->lr_name);
 }
 
-void lustre_swab_lustre_capa_key (struct lustre_capa_key *k)
+void lustre_swab_ldlm_lock_desc (struct ldlm_lock_desc *l)
 {
-        __swab32s (&k->lk_mdsid);
-        __swab32s (&k->lk_keyid);
-        __swab64s (&k->lk_expiry);
+        lustre_swab_ldlm_resource_desc (&l->l_resource);
+        __swab32s (&l->l_req_mode);
+        __swab32s (&l->l_granted_mode);
+        lustre_swab_ldlm_policy_data (&l->l_policy_data);
 }
 
-void lustre_swab_audit_msg (struct audit_msg *r)
+void lustre_swab_ldlm_request (struct ldlm_request *rq)
 {
-        lustre_swab_lustre_id(&r->id);
-        __swab32s (&r->code);
-        __swab32s (&r->result);
-        __swab32s (&r->uid);
-        __swab32s (&r->gid);
-        __swab64s (&r->nid);
+        __swab32s (&rq->lock_flags);
+        CLASSERT(offsetof(typeof(*rq), lock_padding) != 0);
+        lustre_swab_ldlm_lock_desc (&rq->lock_desc);
+        /* lock_handle1 opaque */
+        /* lock_handle2 opaque */
 }
 
-void lustre_swab_audit_attr (struct audit_attr_msg *r)
+void lustre_swab_ldlm_reply (struct ldlm_reply *r)
 {
-        lustre_swab_lustre_id(&r->id);
-        __swab64s (&r->attr);
+        __swab32s (&r->lock_flags);
+        CLASSERT(offsetof(typeof(*r), lock_padding) != 0);
+        lustre_swab_ldlm_lock_desc (&r->lock_desc);
+        /* lock_handle opaque */
+        __swab64s (&r->lock_policy_res1);
+        __swab64s (&r->lock_policy_res2);
 }
 
 /* no one calls this */
@@ -966,28 +2002,126 @@ int llog_log_swabbed(struct llog_log_hdr *hdr)
         return -1;
 }
 
-void lustre_assert_wire_constants(void)
+void lustre_swab_qdata(struct qunit_data *d)
 {
+        __swab32s (&d->qd_id);
+        __swab32s (&d->qd_flags);
+        __swab64s (&d->qd_count);
 }
 
-/* for gks key rec */
-void lustre_swab_key_perms(struct key_perm *kperm)
+void lustre_swab_qdata_old(struct qunit_data_old *d)
 {
-        int i;
-        __swab32s(&kperm->kp_uid);
-        __swab32s(&kperm->kp_gid);
-        __swab32s(&kperm->kp_mode);
-        __swab32s(&kperm->kp_acl_count);
-        for (i = 0; i < kperm->kp_acl_count; i++) {
-                __swab16s(&kperm->kp_acls[i].e_tag); 
-                __swab16s(&kperm->kp_acls[i].e_perm); 
-                __swab32s(&kperm->kp_acls[i].e_id); 
-        }  
+        __swab32s (&d->qd_id);
+        __swab32s (&d->qd_type);
+        __swab32s (&d->qd_count);
+        __swab32s (&d->qd_isblk);
 }
 
-void lustre_swab_key_context (struct key_context *kctxt)
+#ifdef __KERNEL__
+struct qunit_data *lustre_quota_old_to_new(struct qunit_data_old *d)
+{
+        struct qunit_data_old tmp;
+        struct qunit_data *ret;
+        ENTRY;
+
+        if (!d)
+                return NULL;
+
+        tmp = *d;
+        ret = (struct qunit_data *)d;
+        ret->qd_id = tmp.qd_id;
+        ret->qd_flags = (tmp.qd_type ? QUOTA_IS_GRP : 0) | (tmp.qd_isblk ? QUOTA_IS_BLOCK : 0);
+        ret->qd_count = tmp.qd_count;
+        RETURN(ret);
+
+}
+EXPORT_SYMBOL(lustre_quota_old_to_new);
+
+struct qunit_data_old *lustre_quota_new_to_old(struct qunit_data *d)
+{
+        struct qunit_data tmp;
+        struct qunit_data_old *ret;
+        ENTRY;
+
+        if (!d)
+                return NULL;
+
+        LASSERT(d->qd_count <= MAX_QUOTA_COUNT32);
+        tmp = *d;
+        ret = (struct qunit_data_old *)d;
+        ret->qd_id = tmp.qd_id;
+        ret->qd_type = ((tmp.qd_flags & QUOTA_IS_GRP) ? GRPQUOTA : USRQUOTA);
+        ret->qd_count = (__u32)tmp.qd_count;
+        ret->qd_isblk = ((tmp.qd_flags & QUOTA_IS_BLOCK) ? 1 : 0);
+        RETURN(ret);
+}
+EXPORT_SYMBOL(lustre_quota_new_to_old);
+#endif /* __KERNEL__ */
+
+static inline int req_ptlrpc_body_swabbed(struct ptlrpc_request *req)
 {
-        __swab32s(&kctxt->kc_command);
-        __swab32s(&kctxt->kc_valid); /* for use with open */
-        lustre_swab_key_perms(&kctxt->kc_perm);
+        LASSERT(req->rq_reqmsg);
+
+        switch (req->rq_reqmsg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return 1;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                return lustre_req_swabbed(req, MSG_PTLRPC_BODY_OFF);
+        default:
+                CERROR("bad lustre msg magic: %#08X\n",
+                       req->rq_reqmsg->lm_magic);
+        }
+        return 0;
+}
+
+static inline int rep_ptlrpc_body_swabbed(struct ptlrpc_request *req)
+{
+        LASSERT(req->rq_repmsg);
+
+        switch (req->rq_repmsg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V1:
+        case LUSTRE_MSG_MAGIC_V1_SWABBED:
+                return 1;
+        case LUSTRE_MSG_MAGIC_V2:
+        case LUSTRE_MSG_MAGIC_V2_SWABBED:
+                return lustre_rep_swabbed(req, MSG_PTLRPC_BODY_OFF);
+        default:
+                /* uninitialized yet */
+                return 0;
+        }
+}
+
+void _debug_req(struct ptlrpc_request *req, __u32 mask,
+                struct libcfs_debug_msg_data *data, const char *fmt, ... )
+
+{
+        va_list args;
+
+        va_start(args, fmt);
+        libcfs_debug_vmsg2(data->msg_cdls, data->msg_subsys, mask, data->msg_file,
+                           data->msg_fn, data->msg_line, fmt, args,
+                           " req@%p x"LPD64"/t"LPD64" o%d->%s@%s:%d lens %d/%d ref %d fl "
+                           REQ_FLAGS_FMT"/%x/%x rc %d/%d\n",
+                           req, req->rq_xid, req->rq_transno,
+                           req->rq_reqmsg ? lustre_msg_get_opc(req->rq_reqmsg) : -1,
+                           req->rq_import ? obd2cli_tgt(req->rq_import->imp_obd) :
+                           req->rq_export ?
+                                (char*)req->rq_export->exp_client_uuid.uuid : "<?>",
+                           req->rq_import ?
+                                (char *)req->rq_import->imp_connection->c_remote_uuid.uuid :
+                           req->rq_export ?
+                                (char *)req->rq_export->exp_connection->c_remote_uuid.uuid : "<?>",
+                           (req->rq_import && req->rq_import->imp_client) ?
+                                req->rq_import->imp_client->cli_request_portal : -1,
+                           req->rq_reqlen, req->rq_replen, atomic_read(&req->rq_refcount),
+                           DEBUG_REQ_FLAGS(req),
+                           req->rq_reqmsg ? lustre_msg_get_flags(req->rq_reqmsg) : 0,
+                           req->rq_repmsg ? lustre_msg_get_flags(req->rq_repmsg) : 0,
+                           req->rq_status,
+                           req->rq_repmsg ? lustre_msg_get_status(req->rq_repmsg) : 0);
+        va_end(args);
 }
+
+EXPORT_SYMBOL(_debug_req);