X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fpack_generic.c;h=6de2ad30dde7a8bd0f615dae4ca4720f61e3a847;hp=690f4f312c0edd0e1e639da193d18aebb64f6861;hb=f4547f0569774eb794fb143362e201f658415f4c;hpb=4c1c3b4d33c85216b8d50264b8ba8101173e2698 diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c index 690f4f3..6de2ad3 100644 --- a/lustre/ptlrpc/pack_generic.c +++ b/lustre/ptlrpc/pack_generic.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -57,7 +57,8 @@ static inline int lustre_msg_hdr_size_v2(int count) { - return size_round(offsetof(struct lustre_msg_v2, lm_buflens[count])); + return cfs_size_round(offsetof(struct lustre_msg_v2, + lm_buflens[count])); } int lustre_msg_hdr_size(__u32 magic, int count) @@ -72,13 +73,30 @@ int lustre_msg_hdr_size(__u32 magic, int count) } EXPORT_SYMBOL(lustre_msg_hdr_size); -int lustre_msg_swabbed(struct lustre_msg *msg) +void ptlrpc_buf_set_swabbed(struct ptlrpc_request *req, const int inout, + int index) { - return (msg->lm_magic == LUSTRE_MSG_MAGIC_V2_SWABBED); + if (inout) + lustre_set_req_swabbed(req, index); + else + lustre_set_rep_swabbed(req, index); } +EXPORT_SYMBOL(ptlrpc_buf_set_swabbed); -static inline int -lustre_msg_check_version_v2(struct lustre_msg_v2 *msg, __u32 version) +int ptlrpc_buf_need_swab(struct ptlrpc_request *req, const int inout, + int index) +{ + if (inout) + return (ptlrpc_req_need_swab(req) && + !lustre_req_swabbed(req, index)); + else + return (ptlrpc_rep_need_swab(req) && + !lustre_rep_swabbed(req, index)); +} +EXPORT_SYMBOL(ptlrpc_buf_need_swab); + +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; @@ -88,23 +106,32 @@ int lustre_msg_check_version(struct lustre_msg *msg, __u32 version) { switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V1: - case LUSTRE_MSG_MAGIC_V1_SWABBED: CERROR("msg v1 not supported - please upgrade you system\n"); return -EINVAL; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return lustre_msg_check_version_v2(msg, version); default: CERROR("incorrect message magic: %08x\n", msg->lm_magic); return 0; } } +EXPORT_SYMBOL(lustre_msg_check_version); /* early reply size */ -int lustre_msg_early_size() { +int lustre_msg_early_size() +{ static int size = 0; - if (!size) - size = lustre_msg_size(LUSTRE_MSG_MAGIC_V2, 1, NULL); + if (!size) { + /* Always reply old ptlrpc_body_v2 to keep interoprability + * with the old client (< 2.3) which doesn't have pb_jobid + * in the ptlrpc_body. + * + * XXX Remove this whenever we dorp interoprability with such + * client. + */ + __u32 pblen = sizeof(struct ptlrpc_body_v2); + size = lustre_msg_size(LUSTRE_MSG_MAGIC_V2, 1, &pblen); + } return size; } EXPORT_SYMBOL(lustre_msg_early_size); @@ -116,7 +143,7 @@ int lustre_msg_size_v2(int count, __u32 *lengths) size = lustre_msg_hdr_size_v2(count); for (i = 0; i < count; i++) - size += size_round(lengths[i]); + size += cfs_size_round(lengths[i]); return size; } @@ -138,7 +165,7 @@ int lustre_msg_size(__u32 magic, int count, __u32 *lens) } LASSERT(count > 0); - LASSERT(lens[MSG_PTLRPC_BODY_OFF] == sizeof(struct ptlrpc_body)); + LASSERT(lens[MSG_PTLRPC_BODY_OFF] >= sizeof(struct ptlrpc_body_v2)); switch (magic) { case LUSTRE_MSG_MAGIC_V2: @@ -148,6 +175,7 @@ int lustre_msg_size(__u32 magic, int count, __u32 *lens) return -EINVAL; } } +EXPORT_SYMBOL(lustre_msg_size); /* This is used to determine the size of a buffer that was already packed * and will correctly handle the different message formats. */ @@ -161,6 +189,7 @@ int lustre_packed_msg_size(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_packed_msg_size); void lustre_init_msg_v2(struct lustre_msg_v2 *msg, int count, __u32 *lens, char **bufs) @@ -201,7 +230,6 @@ static int lustre_pack_request_v2(struct ptlrpc_request *req, 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; } @@ -229,71 +257,74 @@ int lustre_pack_request(struct ptlrpc_request *req, __u32 magic, int count, return -EINVAL; } } +EXPORT_SYMBOL(lustre_pack_request); #if RS_DEBUG CFS_LIST_HEAD(ptlrpc_rs_debug_lru); spinlock_t ptlrpc_rs_debug_lock; -#define PTLRPC_RS_DEBUG_LRU_ADD(rs) \ -do { \ - spin_lock(&ptlrpc_rs_debug_lock); \ - list_add_tail(&(rs)->rs_debug_list, &ptlrpc_rs_debug_lru); \ - spin_unlock(&ptlrpc_rs_debug_lock); \ +#define PTLRPC_RS_DEBUG_LRU_ADD(rs) \ +do { \ + spin_lock(&ptlrpc_rs_debug_lock); \ + cfs_list_add_tail(&(rs)->rs_debug_list, &ptlrpc_rs_debug_lru); \ + spin_unlock(&ptlrpc_rs_debug_lock); \ } while (0) -#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); \ +#define PTLRPC_RS_DEBUG_LRU_DEL(rs) \ +do { \ + spin_lock(&ptlrpc_rs_debug_lock); \ + cfs_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 -struct ptlrpc_reply_state *lustre_get_emerg_rs(struct ptlrpc_service *svc) -{ - 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); - memset(rs, 0, svc->srv_max_reply_size); - rs->rs_service = svc; - rs->rs_prealloc = 1; +struct ptlrpc_reply_state * +lustre_get_emerg_rs(struct ptlrpc_service_part *svcpt) +{ + struct ptlrpc_reply_state *rs = NULL; + + spin_lock(&svcpt->scp_rep_lock); + + /* See if we have anything in a pool, and wait if nothing */ + while (cfs_list_empty(&svcpt->scp_rep_idle)) { + struct l_wait_info lwi; + int rc; + + spin_unlock(&svcpt->scp_rep_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(svcpt->scp_rep_waitq, + !cfs_list_empty(&svcpt->scp_rep_idle), &lwi); + if (rc != 0) + goto out; + spin_lock(&svcpt->scp_rep_lock); + } + + rs = cfs_list_entry(svcpt->scp_rep_idle.next, + struct ptlrpc_reply_state, rs_list); + cfs_list_del(&rs->rs_list); + + spin_unlock(&svcpt->scp_rep_lock); + + memset(rs, 0, svcpt->scp_service->srv_max_reply_size); + rs->rs_svcpt = svcpt; + rs->rs_prealloc = 1; out: - return rs; + return rs; } void lustre_put_emerg_rs(struct ptlrpc_reply_state *rs) { - struct ptlrpc_service *svc = rs->rs_service; - - LASSERT(svc); + struct ptlrpc_service_part *svcpt = rs->rs_svcpt; - 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); + spin_lock(&svcpt->scp_rep_lock); + cfs_list_add(&rs->rs_list, &svcpt->scp_rep_idle); + spin_unlock(&svcpt->scp_rep_lock); + cfs_waitq_signal(&svcpt->scp_rep_waitq); } int lustre_pack_reply_v2(struct ptlrpc_request *req, int count, @@ -305,8 +336,11 @@ int lustre_pack_reply_v2(struct ptlrpc_request *req, int count, LASSERT(req->rq_reply_state == NULL); - if ((flags & LPRFL_EARLY_REPLY) == 0) - req->rq_packed_final = 1; + if ((flags & LPRFL_EARLY_REPLY) == 0) { + spin_lock(&req->rq_lock); + req->rq_packed_final = 1; + spin_unlock(&req->rq_lock); + } msg_len = lustre_msg_size_v2(count, lens); rc = sptlrpc_svc_alloc_rs(req, msg_len); @@ -314,14 +348,14 @@ int lustre_pack_reply_v2(struct ptlrpc_request *req, int count, RETURN(rc); rs = req->rq_reply_state; - atomic_set(&rs->rs_refcount, 1); /* 1 ref for rq_reply_state */ + cfs_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_svcpt = req->rq_rqbd->rqbd_svcpt; CFS_INIT_LIST_HEAD(&rs->rs_exp_list); CFS_INIT_LIST_HEAD(&rs->rs_obd_list); CFS_INIT_LIST_HEAD(&rs->rs_list); - spin_lock_init(&rs->rs_lock); + spin_lock_init(&rs->rs_lock); req->rq_replen = msg_len; req->rq_reply_state = rs; @@ -329,7 +363,6 @@ int lustre_pack_reply_v2(struct ptlrpc_request *req, int count, 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); PTLRPC_RS_DEBUG_LRU_ADD(rs); @@ -353,7 +386,6 @@ int lustre_pack_reply_flags(struct ptlrpc_request *req, int count, __u32 *lens, switch (req->rq_reqmsg->lm_magic) { case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: rc = lustre_pack_reply_v2(req, count, lens, bufs, flags); break; default: @@ -366,12 +398,14 @@ int lustre_pack_reply_flags(struct ptlrpc_request *req, int count, __u32 *lens, lustre_msg_size(req->rq_reqmsg->lm_magic, count, lens)); return rc; } +EXPORT_SYMBOL(lustre_pack_reply_flags); int lustre_pack_reply(struct ptlrpc_request *req, int count, __u32 *lens, char **bufs) { return lustre_pack_reply_flags(req, count, lens, bufs, 0); } +EXPORT_SYMBOL(lustre_pack_reply); void *lustre_msg_buf_v2(struct lustre_msg_v2 *m, int n, int min_size) { @@ -390,14 +424,14 @@ void *lustre_msg_buf_v2(struct lustre_msg_v2 *m, int n, int min_size) buflen = m->lm_buflens[n]; if (unlikely(buflen < min_size)) { CERROR("msg %p buffer[%d] size %d too small " - "(required %d, opc=%d)\n", - m, n, buflen, min_size, lustre_msg_get_opc(m)); + "(required %d, opc=%d)\n", m, n, buflen, min_size, + n == MSG_PTLRPC_BODY_OFF ? -1 : lustre_msg_get_opc(m)); return NULL; } offset = lustre_msg_hdr_size_v2(bufcount); for (i = 0; i < n; i++) - offset += size_round(m->lm_buflens[i]); + offset += cfs_size_round(m->lm_buflens[i]); return (char *)m + offset; } @@ -406,13 +440,13 @@ void *lustre_msg_buf(struct lustre_msg *m, int n, int min_size) { switch (m->lm_magic) { 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(msg:%p)\n", m->lm_magic, m); return NULL; } } +EXPORT_SYMBOL(lustre_msg_buf); int lustre_shrink_msg_v2(struct lustre_msg_v2 *msg, int segment, unsigned int newlen, int move_data) @@ -430,7 +464,7 @@ int lustre_shrink_msg_v2(struct lustre_msg_v2 *msg, int segment, 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]); + tail_len += cfs_size_round(msg->lm_buflens[n]); } msg->lm_buflens[segment] = newlen; @@ -471,26 +505,28 @@ int lustre_shrink_msg(struct lustre_msg *msg, int segment, LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_shrink_msg); void lustre_free_reply_state(struct ptlrpc_reply_state *rs) { PTLRPC_RS_DEBUG_LRU_DEL(rs); - LASSERT (atomic_read(&rs->rs_refcount) == 0); + LASSERT (cfs_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)); + LASSERT (cfs_list_empty(&rs->rs_exp_list)); + LASSERT (cfs_list_empty(&rs->rs_obd_list)); sptlrpc_svc_free_rs(rs); } +EXPORT_SYMBOL(lustre_free_reply_state); static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) { - int flipped, required_len, i; + int swabbed, required_len, i; /* Now we know the sender speaks my language. */ required_len = lustre_msg_hdr_size_v2(0); @@ -500,9 +536,10 @@ static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) return -EINVAL; } - flipped = lustre_msg_swabbed(m); + swabbed = (m->lm_magic == LUSTRE_MSG_MAGIC_V2_SWABBED); - if (flipped) { + if (swabbed) { + __swab32s(&m->lm_magic); __swab32s(&m->lm_bufcount); __swab32s(&m->lm_secflvr); __swab32s(&m->lm_repsize); @@ -521,9 +558,9 @@ static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) } for (i = 0; i < m->lm_bufcount; i++) { - if (flipped) + if (swabbed) __swab32s(&m->lm_buflens[i]); - required_len += size_round(m->lm_buflens[i]); + required_len += cfs_size_round(m->lm_buflens[i]); } if (len < required_len) { @@ -534,10 +571,10 @@ static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) return -EINVAL; } - return 0; + return swabbed; } -int lustre_unpack_msg(struct lustre_msg *m, int len) +int __lustre_unpack_msg(struct lustre_msg *m, int len) { int required_len, rc; ENTRY; @@ -557,31 +594,51 @@ int lustre_unpack_msg(struct lustre_msg *m, int len) RETURN(-EINVAL); } - switch (m->lm_magic) { - 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; - } + rc = lustre_unpack_msg_v2(m, len); RETURN(rc); } +EXPORT_SYMBOL(__lustre_unpack_msg); + +int ptlrpc_unpack_req_msg(struct ptlrpc_request *req, int len) +{ + int rc; + rc = __lustre_unpack_msg(req->rq_reqmsg, len); + if (rc == 1) { + lustre_set_req_swabbed(req, MSG_PTLRPC_HEADER_OFF); + rc = 0; + } + return rc; +} +EXPORT_SYMBOL(ptlrpc_unpack_req_msg); + +int ptlrpc_unpack_rep_msg(struct ptlrpc_request *req, int len) +{ + int rc; + rc = __lustre_unpack_msg(req->rq_repmsg, len); + if (rc == 1) { + lustre_set_rep_swabbed(req, MSG_PTLRPC_HEADER_OFF); + rc = 0; + } + return rc; +} +EXPORT_SYMBOL(ptlrpc_unpack_rep_msg); -static inline int lustre_unpack_ptlrpc_body_v2(struct lustre_msg_v2 *m, - int offset) +static inline int lustre_unpack_ptlrpc_body_v2(struct ptlrpc_request *req, + const int inout, int offset) { struct ptlrpc_body *pb; + struct lustre_msg_v2 *m = inout ? req->rq_reqmsg : req->rq_repmsg; - pb = lustre_msg_buf_v2(m, offset, sizeof(*pb)); + pb = lustre_msg_buf_v2(m, offset, sizeof(struct ptlrpc_body_v2)); if (!pb) { CERROR("error unpacking ptlrpc body\n"); return -EFAULT; } - if (lustre_msg_swabbed(m)) + if (ptlrpc_buf_need_swab(req, inout, offset)) { lustre_swab_ptlrpc_body(pb); + ptlrpc_buf_set_swabbed(req, inout, offset); + } if ((pb->pb_version & ~LUSTRE_VERSION_MASK) != PTLRPC_MSG_VERSION) { CERROR("wrong lustre_msg version %08x\n", pb->pb_version); @@ -595,11 +652,9 @@ int lustre_unpack_req_ptlrpc_body(struct ptlrpc_request *req, int offset) { switch (req->rq_reqmsg->lm_magic) { 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); + return lustre_unpack_ptlrpc_body_v2(req, 1, offset); default: - CERROR("bad lustre msg magic: %#08X\n", + CERROR("bad lustre msg magic: %08x\n", req->rq_reqmsg->lm_magic); return -EINVAL; } @@ -609,11 +664,9 @@ int lustre_unpack_rep_ptlrpc_body(struct ptlrpc_request *req, int offset) { switch (req->rq_repmsg->lm_magic) { 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); + return lustre_unpack_ptlrpc_body_v2(req, 0, offset); default: - CERROR("bad lustre msg magic: %#08X\n", + CERROR("bad lustre msg magic: %08x\n", req->rq_repmsg->lm_magic); return -EINVAL; } @@ -628,9 +681,9 @@ static inline int lustre_msg_buflen_v2(struct lustre_msg_v2 *m, int 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) + * lustre_msg_buflen - return the length of buffer \a n in message \a m + * \param m lustre_msg (request or reply) to look at + * \param n message index (base 0) * * returns zero for non-existent message indices */ @@ -638,7 +691,6 @@ int lustre_msg_buflen(struct lustre_msg *m, int n) { switch (m->lm_magic) { case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return lustre_msg_buflen_v2(m, n); default: CERROR("incorrect message magic: %08x\n", m->lm_magic); @@ -675,7 +727,6 @@ int lustre_msg_bufcount(struct lustre_msg *m) { switch (m->lm_magic) { case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return m->lm_bufcount; default: CERROR("incorrect message magic: %08x\n", m->lm_magic); @@ -692,7 +743,6 @@ char *lustre_msg_string(struct lustre_msg *m, int index, int max_len) switch (m->lm_magic) { 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; @@ -729,55 +779,33 @@ char *lustre_msg_string(struct lustre_msg *m, int index, int max_len) return str; } +EXPORT_SYMBOL(lustre_msg_string); /* Wrap up the normal fixed length cases */ -void *lustre_swab_buf(struct lustre_msg *msg, int index, int min_size, - void *swabber) +static inline void *__lustre_swab_buf(struct lustre_msg *msg, int index, + int min_size, void *swabber) { void *ptr = NULL; LASSERT(msg != NULL); switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: ptr = lustre_msg_buf_v2(msg, index, min_size); break; default: CERROR("incorrect message magic: %08x\n", msg->lm_magic); } - if (ptr == NULL) - return NULL; - if (swabber != NULL && lustre_msg_swabbed(msg)) + if (ptr && swabber) ((void (*)(void *))swabber)(ptr); return ptr; } -void *lustre_swab_reqbuf(struct ptlrpc_request *req, int index, int min_size, - void *swabber) -{ - if (lustre_req_swabbed(req, index)) - return lustre_msg_buf(req->rq_reqmsg, index, min_size); - - lustre_set_req_swabbed(req, index); - return lustre_swab_buf(req->rq_reqmsg, index, min_size, swabber); -} - -void *lustre_swab_repbuf(struct ptlrpc_request *req, int index, int min_size, - void *swabber) -{ - if (lustre_rep_swabbed(req, index)) - return lustre_msg_buf(req->rq_repmsg, index, min_size); - - lustre_set_rep_swabbed(req, index); - return lustre_swab_buf(req->rq_repmsg, index, min_size, swabber); -} - static inline struct ptlrpc_body *lustre_msg_ptlrpc_body(struct lustre_msg *msg) { return lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, - sizeof(struct ptlrpc_body)); + sizeof(struct ptlrpc_body_v2)); } __u32 lustre_msghdr_get_flags(struct lustre_msg *msg) @@ -787,7 +815,6 @@ __u32 lustre_msghdr_get_flags(struct lustre_msg *msg) case LUSTRE_MSG_MAGIC_V1_SWABBED: return 0; case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: /* already in host endian */ return msg->lm_flags; default: @@ -813,8 +840,7 @@ void lustre_msghdr_set_flags(struct lustre_msg *msg, __u32 flags) __u32 lustre_msg_get_flags(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -828,6 +854,7 @@ __u32 lustre_msg_get_flags(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_msg_get_flags); void lustre_msg_add_flags(struct lustre_msg *msg, int flags) { @@ -842,6 +869,7 @@ void lustre_msg_add_flags(struct lustre_msg *msg, int flags) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_add_flags); void lustre_msg_set_flags(struct lustre_msg *msg, int flags) { @@ -856,12 +884,12 @@ void lustre_msg_set_flags(struct lustre_msg *msg, int flags) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_flags); void lustre_msg_clear_flags(struct lustre_msg *msg, int flags) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_flags &= ~(MSG_GEN_FLAG_MASK & flags); @@ -871,12 +899,12 @@ void lustre_msg_clear_flags(struct lustre_msg *msg, int flags) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_clear_flags); __u32 lustre_msg_get_op_flags(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -888,6 +916,7 @@ __u32 lustre_msg_get_op_flags(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_msg_get_op_flags); void lustre_msg_add_op_flags(struct lustre_msg *msg, int flags) { @@ -902,6 +931,7 @@ void lustre_msg_add_op_flags(struct lustre_msg *msg, int flags) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_add_op_flags); void lustre_msg_set_op_flags(struct lustre_msg *msg, int flags) { @@ -916,12 +946,12 @@ void lustre_msg_set_op_flags(struct lustre_msg *msg, int flags) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_op_flags); struct lustre_handle *lustre_msg_get_handle(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -934,12 +964,12 @@ struct lustre_handle *lustre_msg_get_handle(struct lustre_msg *msg) return NULL; } } +EXPORT_SYMBOL(lustre_msg_get_handle); __u32 lustre_msg_get_type(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -952,12 +982,12 @@ __u32 lustre_msg_get_type(struct lustre_msg *msg) return PTL_RPC_MSG_ERR; } } +EXPORT_SYMBOL(lustre_msg_get_type); __u32 lustre_msg_get_version(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -970,12 +1000,12 @@ __u32 lustre_msg_get_version(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_msg_get_version); void lustre_msg_add_version(struct lustre_msg *msg, int version) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); pb->pb_version |= version; @@ -985,12 +1015,12 @@ void lustre_msg_add_version(struct lustre_msg *msg, int version) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_add_version); __u32 lustre_msg_get_opc(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1000,15 +1030,16 @@ __u32 lustre_msg_get_opc(struct lustre_msg *msg) } default: CERROR("incorrect message magic: %08x(msg:%p)\n", msg->lm_magic, msg); + LBUG(); return 0; } } +EXPORT_SYMBOL(lustre_msg_get_opc); __u64 lustre_msg_get_last_xid(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1021,12 +1052,12 @@ __u64 lustre_msg_get_last_xid(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_msg_get_last_xid); __u64 lustre_msg_get_last_committed(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1039,6 +1070,7 @@ __u64 lustre_msg_get_last_committed(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_msg_get_last_committed); __u64 *lustre_msg_get_versions(struct lustre_msg *msg) { @@ -1058,12 +1090,12 @@ __u64 *lustre_msg_get_versions(struct lustre_msg *msg) return NULL; } } +EXPORT_SYMBOL(lustre_msg_get_versions); __u64 lustre_msg_get_transno(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1076,12 +1108,12 @@ __u64 lustre_msg_get_transno(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_msg_get_transno); int lustre_msg_get_status(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1095,12 +1127,12 @@ int lustre_msg_get_status(struct lustre_msg *msg) return -EINVAL; } } +EXPORT_SYMBOL(lustre_msg_get_status); __u64 lustre_msg_get_slv(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1109,17 +1141,17 @@ __u64 lustre_msg_get_slv(struct lustre_msg *msg) return pb->pb_slv; } default: - CERROR("invalid msg magic %x\n", msg->lm_magic); + CERROR("invalid msg magic %08x\n", msg->lm_magic); return -EINVAL; } } +EXPORT_SYMBOL(lustre_msg_get_slv); void lustre_msg_set_slv(struct lustre_msg *msg, __u64 slv) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1133,12 +1165,12 @@ void lustre_msg_set_slv(struct lustre_msg *msg, __u64 slv) return; } } +EXPORT_SYMBOL(lustre_msg_set_slv); __u32 lustre_msg_get_limit(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1151,13 +1183,13 @@ __u32 lustre_msg_get_limit(struct lustre_msg *msg) return -EINVAL; } } +EXPORT_SYMBOL(lustre_msg_get_limit); void lustre_msg_set_limit(struct lustre_msg *msg, __u64 limit) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1167,16 +1199,16 @@ void lustre_msg_set_limit(struct lustre_msg *msg, __u64 limit) return; } default: - CERROR("invalid msg magic %x\n", msg->lm_magic); + CERROR("invalid msg magic %08x\n", msg->lm_magic); return; } } +EXPORT_SYMBOL(lustre_msg_set_limit); __u32 lustre_msg_get_conn_cnt(struct lustre_msg *msg) { switch (msg->lm_magic) { - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1189,6 +1221,7 @@ __u32 lustre_msg_get_conn_cnt(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_msg_get_conn_cnt); int lustre_msg_is_v1(struct lustre_msg *msg) { @@ -1200,18 +1233,19 @@ int lustre_msg_is_v1(struct lustre_msg *msg) return 0; } } +EXPORT_SYMBOL(lustre_msg_is_v1); __u32 lustre_msg_get_magic(struct lustre_msg *msg) { switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return msg->lm_magic; default: CERROR("incorrect message magic: %08x\n", msg->lm_magic); return 0; } } +EXPORT_SYMBOL(lustre_msg_get_magic); __u32 lustre_msg_get_timeout(struct lustre_msg *msg) { @@ -1219,8 +1253,7 @@ __u32 lustre_msg_get_timeout(struct lustre_msg *msg) case LUSTRE_MSG_MAGIC_V1: case LUSTRE_MSG_MAGIC_V1_SWABBED: return 0; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1241,8 +1274,7 @@ __u32 lustre_msg_get_service_time(struct lustre_msg *msg) case LUSTRE_MSG_MAGIC_V1: case LUSTRE_MSG_MAGIC_V1_SWABBED: return 0; - case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: { + case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); if (!pb) { CERROR("invalid msg %p: no ptlrpc body!\n", msg); @@ -1257,14 +1289,32 @@ __u32 lustre_msg_get_service_time(struct lustre_msg *msg) } } +char *lustre_msg_get_jobid(struct lustre_msg *msg) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V1: + case LUSTRE_MSG_MAGIC_V1_SWABBED: + return NULL; + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = + lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, + sizeof(struct ptlrpc_body)); + if (!pb) + return NULL; + + return pb->pb_jobid; + } + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return NULL; + } +} +EXPORT_SYMBOL(lustre_msg_get_jobid); + __u32 lustre_msg_get_cksum(struct lustre_msg *msg) { 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 msg->lm_cksum; default: CERROR("incorrect message magic: %08x\n", msg->lm_magic); @@ -1272,22 +1322,48 @@ __u32 lustre_msg_get_cksum(struct lustre_msg *msg) } } +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) +/* + * In 1.6 and 1.8 the checksum was computed only on struct ptlrpc_body as + * it was in 1.6 (88 bytes, smaller than the full size in 1.8). It makes + * more sense to compute the checksum on the full ptlrpc_body, regardless + * of what size it is, but in order to keep interoperability with 1.8 we + * can optionally also checksum only the first 88 bytes (caller decides). */ +# define ptlrpc_body_cksum_size_compat18 88 + +__u32 lustre_msg_calc_cksum(struct lustre_msg *msg, int compat18) +#else +# warning "remove checksum compatibility support for b1_8" __u32 lustre_msg_calc_cksum(struct lustre_msg *msg) +#endif { - 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: { - struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); - LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); - return crc32_le(~(__u32)0, (unsigned char *)pb, sizeof(*pb)); - } - default: - CERROR("incorrect message magic: %08x\n", msg->lm_magic); - return 0; - } + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V2: { + struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) + __u32 crc; + unsigned int hsize = 4; + __u32 len = compat18 ? ptlrpc_body_cksum_size_compat18 : + lustre_msg_buflen(msg, MSG_PTLRPC_BODY_OFF); + LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); + cfs_crypto_hash_digest(CFS_HASH_ALG_CRC32, (unsigned char *)pb, + len, NULL, 0, (unsigned char *)&crc, + &hsize); + return crc; +#else +# warning "remove checksum compatibility support for b1_8" + __u32 crc; + unsigned int hsize = 4; + cfs_crypto_hash_digest(CFS_HASH_ALG_CRC32, (unsigned char *)pb, + lustre_msg_buflen(msg, MSG_PTLRPC_BODY_OFF), + NULL, 0, (unsigned char *)&crc, &hsize); + return crc; +#endif + } + default: + CERROR("incorrect message magic: %08x\n", msg->lm_magic); + return 0; + } } void lustre_msg_set_handle(struct lustre_msg *msg, struct lustre_handle *handle) @@ -1303,6 +1379,7 @@ void lustre_msg_set_handle(struct lustre_msg *msg, struct lustre_handle *handle) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_handle); void lustre_msg_set_type(struct lustre_msg *msg, __u32 type) { @@ -1317,6 +1394,7 @@ void lustre_msg_set_type(struct lustre_msg *msg, __u32 type) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_type); void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc) { @@ -1331,6 +1409,7 @@ void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_opc); void lustre_msg_set_last_xid(struct lustre_msg *msg, __u64 last_xid) { @@ -1345,6 +1424,7 @@ void lustre_msg_set_last_xid(struct lustre_msg *msg, __u64 last_xid) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_last_xid); void lustre_msg_set_last_committed(struct lustre_msg *msg, __u64 last_committed) { @@ -1359,6 +1439,7 @@ void lustre_msg_set_last_committed(struct lustre_msg *msg, __u64 last_committed) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_last_committed); void lustre_msg_set_versions(struct lustre_msg *msg, __u64 *versions) { @@ -1378,6 +1459,7 @@ void lustre_msg_set_versions(struct lustre_msg *msg, __u64 *versions) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_versions); void lustre_msg_set_transno(struct lustre_msg *msg, __u64 transno) { @@ -1392,6 +1474,7 @@ void lustre_msg_set_transno(struct lustre_msg *msg, __u64 transno) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_transno); void lustre_msg_set_status(struct lustre_msg *msg, __u32 status) { @@ -1406,6 +1489,7 @@ void lustre_msg_set_status(struct lustre_msg *msg, __u32 status) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_status); void lustre_msg_set_conn_cnt(struct lustre_msg *msg, __u32 conn_cnt) { @@ -1420,6 +1504,7 @@ void lustre_msg_set_conn_cnt(struct lustre_msg *msg, __u32 conn_cnt) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } +EXPORT_SYMBOL(lustre_msg_set_conn_cnt); void lustre_msg_set_timeout(struct lustre_msg *msg, __u32 timeout) { @@ -1453,6 +1538,37 @@ void lustre_msg_set_service_time(struct lustre_msg *msg, __u32 service_time) } } +void lustre_msg_set_jobid(struct lustre_msg *msg, char *jobid) +{ + switch (msg->lm_magic) { + case LUSTRE_MSG_MAGIC_V1: + return; + case LUSTRE_MSG_MAGIC_V2: { + __u32 opc = lustre_msg_get_opc(msg); + struct ptlrpc_body *pb; + + /* Don't set jobid for ldlm ast RPCs, they've been shrinked. + * See the comment in ptlrpc_request_pack(). */ + if (!opc || opc == LDLM_BL_CALLBACK || + opc == LDLM_CP_CALLBACK || opc == LDLM_GL_CALLBACK) + return; + + pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, + sizeof(struct ptlrpc_body)); + LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg); + + if (jobid != NULL) + memcpy(pb->pb_jobid, jobid, JOBSTATS_JOBID_SIZE); + else if (pb->pb_jobid[0] == '\0') + lustre_get_jobid(pb->pb_jobid); + return; + } + default: + LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); + } +} +EXPORT_SYMBOL(lustre_msg_set_jobid); + void lustre_msg_set_cksum(struct lustre_msg *msg, __u32 cksum) { switch (msg->lm_magic) { @@ -1476,6 +1592,7 @@ void ptlrpc_request_set_replen(struct ptlrpc_request *req) if (req->rq_reqmsg->lm_magic == LUSTRE_MSG_MAGIC_V2) req->rq_reqmsg->lm_repsize = req->rq_replen; } +EXPORT_SYMBOL(ptlrpc_request_set_replen); void ptlrpc_req_set_repsize(struct ptlrpc_request *req, int count, __u32 *lens) { @@ -1483,6 +1600,56 @@ void ptlrpc_req_set_repsize(struct ptlrpc_request *req, int count, __u32 *lens) if (req->rq_reqmsg->lm_magic == LUSTRE_MSG_MAGIC_V2) req->rq_reqmsg->lm_repsize = req->rq_replen; } +EXPORT_SYMBOL(ptlrpc_req_set_repsize); + +/** + * Send a remote set_info_async. + * + * This may go from client to server or server to client. + */ +int do_set_info_async(struct obd_import *imp, + int opcode, int version, + obd_count keylen, void *key, + obd_count vallen, void *val, + struct ptlrpc_request_set *set) +{ + struct ptlrpc_request *req; + char *tmp; + int rc; + ENTRY; + + req = ptlrpc_request_alloc(imp, &RQF_OBD_SET_INFO); + if (req == NULL) + RETURN(-ENOMEM); + + req_capsule_set_size(&req->rq_pill, &RMF_SETINFO_KEY, + RCL_CLIENT, keylen); + req_capsule_set_size(&req->rq_pill, &RMF_SETINFO_VAL, + RCL_CLIENT, vallen); + rc = ptlrpc_request_pack(req, version, opcode); + if (rc) { + ptlrpc_request_free(req); + RETURN(rc); + } + + tmp = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_KEY); + memcpy(tmp, key, keylen); + tmp = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_VAL); + memcpy(tmp, val, vallen); + + ptlrpc_request_set_replen(req); + + if (set) { + ptlrpc_set_add_req(set, req); + ptlrpc_check_set(NULL, set); + } else { + rc = ptlrpc_queue_wait(req); + ptlrpc_req_finished(req); + } + + RETURN(rc); +} +EXPORT_SYMBOL(do_set_info_async); /* byte flipping routines for all wire types declared in * lustre_idl.h implemented here. @@ -1509,7 +1676,14 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *b) __swab64s (&b->pb_pre_versions[2]); __swab64s (&b->pb_pre_versions[3]); CLASSERT(offsetof(typeof(*b), pb_padding) != 0); + /* While we need to maintain compatibility between + * clients and servers without ptlrpc_body_v2 (< 2.3) + * do not swab any fields beyond pb_jobid, as we are + * using this swab function for both ptlrpc_body + * and ptlrpc_body_v2. */ + CLASSERT(offsetof(typeof(*b), pb_jobid) != 0); } +EXPORT_SYMBOL(lustre_swab_ptlrpc_body); void lustre_swab_connect(struct obd_connect_data *ocd) { @@ -1519,21 +1693,45 @@ void lustre_swab_connect(struct obd_connect_data *ocd) __swab64s(&ocd->ocd_ibits_known); __swab32s(&ocd->ocd_index); __swab32s(&ocd->ocd_brw_size); - __swab32s(&ocd->ocd_nllu); - __swab32s(&ocd->ocd_nllg); + /* ocd_blocksize and ocd_inodespace don't need to be swabbed because + * they are 8-byte values */ + __swab16s(&ocd->ocd_grant_extent); + __swab32s(&ocd->ocd_unused); __swab64s(&ocd->ocd_transno); __swab32s(&ocd->ocd_group); __swab32s(&ocd->ocd_cksum_types); + __swab32s(&ocd->ocd_instance); + /* Fields after ocd_cksum_types are only accessible by the receiver + * if the corresponding flag in ocd_connect_flags is set. Accessing + * any field after ocd_maxbytes on the receiver without a valid flag + * may result in out-of-bound memory access and kernel oops. */ + if (ocd->ocd_connect_flags & OBD_CONNECT_MAX_EASIZE) + __swab32s(&ocd->ocd_max_easize); + if (ocd->ocd_connect_flags & OBD_CONNECT_MAXBYTES) + __swab64s(&ocd->ocd_maxbytes); CLASSERT(offsetof(typeof(*ocd), padding1) != 0); CLASSERT(offsetof(typeof(*ocd), padding2) != 0); + CLASSERT(offsetof(typeof(*ocd), padding3) != 0); + CLASSERT(offsetof(typeof(*ocd), padding4) != 0); + CLASSERT(offsetof(typeof(*ocd), padding5) != 0); + CLASSERT(offsetof(typeof(*ocd), padding6) != 0); + CLASSERT(offsetof(typeof(*ocd), padding7) != 0); + CLASSERT(offsetof(typeof(*ocd), padding8) != 0); + CLASSERT(offsetof(typeof(*ocd), padding9) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingA) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingB) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingC) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingD) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingE) != 0); + CLASSERT(offsetof(typeof(*ocd), paddingF) != 0); } void lustre_swab_obdo (struct obdo *o) { __swab64s (&o->o_valid); __swab64s (&o->o_id); - __swab64s (&o->o_gr); - __swab64s (&o->o_fid); + __swab64s (&o->o_seq); + __swab64s (&o->o_parent_seq); __swab64s (&o->o_size); __swab64s (&o->o_mtime); __swab64s (&o->o_atime); @@ -1546,14 +1744,22 @@ void lustre_swab_obdo (struct obdo *o) __swab32s (&o->o_gid); __swab32s (&o->o_flags); __swab32s (&o->o_nlink); - __swab32s (&o->o_generation); + __swab32s (&o->o_parent_oid); __swab32s (&o->o_misc); - __swab32s (&o->o_easize); - __swab32s (&o->o_mds); + __swab64s (&o->o_ioepoch); __swab32s (&o->o_stripe_idx); - __swab32s (&o->o_padding_1); - /* o_inline is opaque */ + __swab32s (&o->o_parent_ver); + /* o_handle is opaque */ + /* o_lcookie is swabbed elsewhere */ + __swab32s (&o->o_uid_h); + __swab32s (&o->o_gid_h); + __swab64s (&o->o_data_version); + CLASSERT(offsetof(typeof(*o), o_padding_4) != 0); + CLASSERT(offsetof(typeof(*o), o_padding_5) != 0); + CLASSERT(offsetof(typeof(*o), o_padding_6) != 0); + } +EXPORT_SYMBOL(lustre_swab_obdo); void lustre_swab_obd_statfs (struct obd_statfs *os) { @@ -1568,16 +1774,26 @@ void lustre_swab_obd_statfs (struct obd_statfs *os) __swab32s (&os->os_namelen); __swab64s (&os->os_maxbytes); __swab32s (&os->os_state); - /* no need to swap os_spare */ -} + CLASSERT(offsetof(typeof(*os), os_fprecreated) != 0); + CLASSERT(offsetof(typeof(*os), os_spare2) != 0); + CLASSERT(offsetof(typeof(*os), os_spare3) != 0); + CLASSERT(offsetof(typeof(*os), os_spare4) != 0); + CLASSERT(offsetof(typeof(*os), os_spare5) != 0); + CLASSERT(offsetof(typeof(*os), os_spare6) != 0); + CLASSERT(offsetof(typeof(*os), os_spare7) != 0); + CLASSERT(offsetof(typeof(*os), os_spare8) != 0); + CLASSERT(offsetof(typeof(*os), os_spare9) != 0); +} +EXPORT_SYMBOL(lustre_swab_obd_statfs); void lustre_swab_obd_ioobj (struct obd_ioobj *ioo) { __swab64s (&ioo->ioo_id); - __swab64s (&ioo->ioo_gr); + __swab64s (&ioo->ioo_seq); __swab32s (&ioo->ioo_type); __swab32s (&ioo->ioo_bufcnt); } +EXPORT_SYMBOL(lustre_swab_obd_ioobj); void lustre_swab_niobuf_remote (struct niobuf_remote *nbr) { @@ -1585,67 +1801,70 @@ void lustre_swab_niobuf_remote (struct niobuf_remote *nbr) __swab32s (&nbr->len); __swab32s (&nbr->flags); } +EXPORT_SYMBOL(lustre_swab_niobuf_remote); void lustre_swab_ost_body (struct ost_body *b) { lustre_swab_obdo (&b->oa); } +EXPORT_SYMBOL(lustre_swab_ost_body); void lustre_swab_ost_last_id(obd_id *id) { __swab64s(id); } +EXPORT_SYMBOL(lustre_swab_ost_last_id); void lustre_swab_generic_32s(__u32 *val) { __swab32s(val); } +EXPORT_SYMBOL(lustre_swab_generic_32s); -void lustre_swab_ost_lvb(struct ost_lvb *lvb) +void lustre_swab_gl_desc(union ldlm_gl_desc *desc) { - __swab64s(&lvb->lvb_size); - __swab64s(&lvb->lvb_mtime); - __swab64s(&lvb->lvb_atime); - __swab64s(&lvb->lvb_ctime); - __swab64s(&lvb->lvb_blocks); + lustre_swab_lu_fid(&desc->lquota_desc.gl_id.qid_fid); + __swab64s(&desc->lquota_desc.gl_flags); + __swab64s(&desc->lquota_desc.gl_ver); + __swab64s(&desc->lquota_desc.gl_hardlimit); + __swab64s(&desc->lquota_desc.gl_softlimit); + __swab64s(&desc->lquota_desc.gl_time); + CLASSERT(offsetof(typeof(desc->lquota_desc), gl_pad2) != 0); } -void lustre_swab_mds_status_req (struct mds_status_req *r) +void lustre_swab_ost_lvb_v1(struct ost_lvb_v1 *lvb) { - __swab32s (&r->flags); - __swab32s (&r->repbuf); + __swab64s(&lvb->lvb_size); + __swab64s(&lvb->lvb_mtime); + __swab64s(&lvb->lvb_atime); + __swab64s(&lvb->lvb_ctime); + __swab64s(&lvb->lvb_blocks); } +EXPORT_SYMBOL(lustre_swab_ost_lvb_v1); -void lustre_swab_mds_body (struct mds_body *b) +void lustre_swab_ost_lvb(struct ost_lvb *lvb) { - 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); + __swab64s(&lvb->lvb_size); + __swab64s(&lvb->lvb_mtime); + __swab64s(&lvb->lvb_atime); + __swab64s(&lvb->lvb_ctime); + __swab64s(&lvb->lvb_blocks); + __swab32s(&lvb->lvb_mtime_ns); + __swab32s(&lvb->lvb_atime_ns); + __swab32s(&lvb->lvb_ctime_ns); + __swab32s(&lvb->lvb_padding); +} +EXPORT_SYMBOL(lustre_swab_ost_lvb); + +void lustre_swab_lquota_lvb(struct lquota_lvb *lvb) +{ + __swab64s(&lvb->lvb_flags); + __swab64s(&lvb->lvb_id_may_rel); + __swab64s(&lvb->lvb_id_rel); + __swab64s(&lvb->lvb_id_qunit); + __swab64s(&lvb->lvb_pad1); } +EXPORT_SYMBOL(lustre_swab_lquota_lvb); void lustre_swab_mdt_body (struct mdt_body *b) { @@ -1659,7 +1878,7 @@ void lustre_swab_mdt_body (struct mdt_body *b) __swab64s (&b->ctime); __swab64s (&b->blocks); __swab64s (&b->ioepoch); - __swab64s (&b->ino); + CLASSERT(offsetof(typeof(*b), unused1) != 0); __swab32s (&b->fsuid); __swab32s (&b->fsgid); __swab32s (&b->capability); @@ -1669,22 +1888,26 @@ void lustre_swab_mdt_body (struct mdt_body *b) __swab32s (&b->flags); __swab32s (&b->rdev); __swab32s (&b->nlink); - __swab32s (&b->generation); + CLASSERT(offsetof(typeof(*b), unused2) != 0); __swab32s (&b->suppgid); __swab32s (&b->eadatasize); __swab32s (&b->aclsize); __swab32s (&b->max_mdsize); __swab32s (&b->max_cookiesize); - __swab32s (&b->padding_4); + __swab32s (&b->uid_h); + __swab32s (&b->gid_h); + CLASSERT(offsetof(typeof(*b), padding_5) != 0); } +EXPORT_SYMBOL(lustre_swab_mdt_body); -void lustre_swab_mdt_epoch (struct mdt_epoch *b) +void lustre_swab_mdt_ioepoch (struct mdt_ioepoch *b) { /* handle is opaque */ __swab64s (&b->ioepoch); __swab32s (&b->flags); CLASSERT(offsetof(typeof(*b), padding) != 0); } +EXPORT_SYMBOL(lustre_swab_mdt_ioepoch); void lustre_swab_mgs_target_info(struct mgs_target_info *mti) { @@ -1693,11 +1916,51 @@ void lustre_swab_mgs_target_info(struct mgs_target_info *mti) __swab32s(&mti->mti_stripe_index); __swab32s(&mti->mti_config_ver); __swab32s(&mti->mti_flags); + __swab32s(&mti->mti_instance); __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]); } +EXPORT_SYMBOL(lustre_swab_mgs_target_info); + +void lustre_swab_mgs_nidtbl_entry(struct mgs_nidtbl_entry *entry) +{ + int i; + + __swab64s(&entry->mne_version); + __swab32s(&entry->mne_instance); + __swab32s(&entry->mne_index); + __swab32s(&entry->mne_length); + + /* mne_nid_(count|type) must be one byte size because we're gonna + * access it w/o swapping. */ + CLASSERT(sizeof(entry->mne_nid_count) == sizeof(__u8)); + CLASSERT(sizeof(entry->mne_nid_type) == sizeof(__u8)); + + /* remove this assertion if ipv6 is supported. */ + LASSERT(entry->mne_nid_type == 0); + for (i = 0; i < entry->mne_nid_count; i++) { + CLASSERT(sizeof(lnet_nid_t) == sizeof(__u64)); + __swab64s(&entry->u.nids[i]); + } +} +EXPORT_SYMBOL(lustre_swab_mgs_nidtbl_entry); + +void lustre_swab_mgs_config_body(struct mgs_config_body *body) +{ + __swab64s(&body->mcb_offset); + __swab32s(&body->mcb_units); + __swab16s(&body->mcb_type); +} +EXPORT_SYMBOL(lustre_swab_mgs_config_body); + +void lustre_swab_mgs_config_res(struct mgs_config_res *body) +{ + __swab64s(&body->mcr_offset); + __swab64s(&body->mcr_size); +} +EXPORT_SYMBOL(lustre_swab_mgs_config_res); static void lustre_swab_obd_dqinfo (struct obd_dqinfo *i) { @@ -1718,7 +1981,7 @@ static void lustre_swab_obd_dqblk (struct obd_dqblk *b) __swab64s (&b->dqb_btime); __swab64s (&b->dqb_itime); __swab32s (&b->dqb_valid); - CLASSERT(offsetof(typeof(*b), padding) != 0); + CLASSERT(offsetof(typeof(*b), dqb_padding) != 0); } void lustre_swab_obd_quotactl (struct obd_quotactl *q) @@ -1730,53 +1993,20 @@ void lustre_swab_obd_quotactl (struct obd_quotactl *q) lustre_swab_obd_dqinfo (&q->qc_dqinfo); lustre_swab_obd_dqblk (&q->qc_dqblk); } - -void lustre_swab_quota_adjust_qunit (struct quota_adjust_qunit *q) -{ - __swab32s (&q->qaq_flags); - __swab32s (&q->qaq_id); - __swab64s (&q->qaq_bunit_sz); - __swab64s (&q->qaq_iunit_sz); - __swab64s (&q->padding1); -} - -void lustre_swab_mds_remote_perm (struct mds_remote_perm *p) -{ - __swab32s (&p->rp_uid); - __swab32s (&p->rp_gid); - __swab32s (&p->rp_fsuid); - __swab32s (&p->rp_fsgid); - __swab32s (&p->rp_access_perm); -}; +EXPORT_SYMBOL(lustre_swab_obd_quotactl); void lustre_swab_mdt_remote_perm (struct mdt_remote_perm *p) { __swab32s (&p->rp_uid); __swab32s (&p->rp_gid); __swab32s (&p->rp_fsuid); + __swab32s (&p->rp_fsuid_h); __swab32s (&p->rp_fsgid); + __swab32s (&p->rp_fsgid_h); __swab32s (&p->rp_access_perm); + __swab32s (&p->rp_padding); }; - -void lustre_swab_mds_rec_setattr (struct mds_rec_setattr *sa) -{ - __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); -} +EXPORT_SYMBOL(lustre_swab_mdt_remote_perm); void lustre_swab_fid2path(struct getinfo_fid2path *gf) { @@ -1787,72 +2017,6 @@ void lustre_swab_fid2path(struct getinfo_fid2path *gf) } EXPORT_SYMBOL(lustre_swab_fid2path); -void lustre_swab_mds_rec_join (struct mds_rec_join *jr) -{ - __swab64s(&jr->jr_headsize); - lustre_swab_ll_fid(&jr->jr_fid); -} - -void lustre_swab_mdt_rec_join (struct mdt_rec_join *jr) -{ - __swab64s(&jr->jr_headsize); - lustre_swab_lu_fid(&jr->jr_fid); -} - -void lustre_swab_mds_rec_create (struct mds_rec_create *cr) -{ - __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_mds_rec_link (struct mds_rec_link *lk) -{ - __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_mds_rec_unlink (struct mds_rec_unlink *ul) -{ - __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); -} - void lustre_swab_fiemap_extent(struct ll_fiemap_extent *fm_extent) { __swab64s(&fm_extent->fe_logical); @@ -1876,24 +2040,31 @@ void lustre_swab_fiemap(struct ll_user_fiemap *fiemap) for (i = 0; i < fiemap->fm_mapped_extents; i++) lustre_swab_fiemap_extent(&fiemap->fm_extents[i]); } +EXPORT_SYMBOL(lustre_swab_fiemap); -void lustre_swab_mds_rec_rename (struct mds_rec_rename *rn) +void lustre_swab_idx_info(struct idx_info *ii) { - __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); + __swab32s(&ii->ii_magic); + __swab32s(&ii->ii_flags); + __swab16s(&ii->ii_count); + __swab32s(&ii->ii_attrs); + lustre_swab_lu_fid(&ii->ii_fid); + __swab64s(&ii->ii_version); + __swab64s(&ii->ii_hash_start); + __swab64s(&ii->ii_hash_end); + __swab16s(&ii->ii_keysize); + __swab16s(&ii->ii_recsize); } +void lustre_swab_lip_header(struct lu_idxpage *lip) +{ + /* swab header */ + __swab32s(&lip->lip_magic); + __swab16s(&lip->lip_flags); + __swab16s(&lip->lip_nr); +} +EXPORT_SYMBOL(lustre_swab_lip_header); + void lustre_swab_mdt_rec_reint (struct mdt_rec_reint *rr) { __swab32s (&rr->rr_opcode); @@ -1915,16 +2086,13 @@ void lustre_swab_mdt_rec_reint (struct mdt_rec_reint *rr) __swab64s (&rr->rr_blocks); __swab32s (&rr->rr_bias); __swab32s (&rr->rr_mode); - __swab32s (&rr->rr_padding_1); - __swab32s (&rr->rr_padding_2); - __swab32s (&rr->rr_padding_3); - __swab32s (&rr->rr_padding_4); + __swab32s (&rr->rr_flags); - CLASSERT(offsetof(typeof(*rr), rr_padding_1) != 0); CLASSERT(offsetof(typeof(*rr), rr_padding_2) != 0); CLASSERT(offsetof(typeof(*rr), rr_padding_3) != 0); CLASSERT(offsetof(typeof(*rr), rr_padding_4) != 0); }; +EXPORT_SYMBOL(lustre_swab_mdt_rec_reint); void lustre_swab_lov_desc (struct lov_desc *ld) { @@ -1937,6 +2105,7 @@ void lustre_swab_lov_desc (struct lov_desc *ld) __swab32s (&ld->ld_qos_maxage); /* uuid endian insensitive */ } +EXPORT_SYMBOL(lustre_swab_lov_desc); void lustre_swab_lmv_desc (struct lmv_desc *ld) { @@ -1964,10 +2133,11 @@ static void print_lum (struct lov_user_md *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_object_gr: "LPU64"\n", lum->lmm_object_seq); 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); + CDEBUG(D_OTHER, "\tlmm_stripe_offset/lmm_layout_gen: %#x\n", + lum->u.lum_stripe_offset); } static void lustre_swab_lov_user_md_common(struct lov_user_md_v1 *lum) @@ -1976,26 +2146,14 @@ static void lustre_swab_lov_user_md_common(struct lov_user_md_v1 *lum) __swab32s(&lum->lmm_magic); __swab32s(&lum->lmm_pattern); __swab64s(&lum->lmm_object_id); - __swab64s(&lum->lmm_object_gr); + __swab64s(&lum->lmm_object_seq); __swab32s(&lum->lmm_stripe_size); __swab16s(&lum->lmm_stripe_count); - __swab16s(&lum->lmm_stripe_offset); + __swab16s(&lum->u.lum_stripe_offset); print_lum(lum); EXIT; } -static void print_lumj (struct lov_user_md_join *lumj) -{ - 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_lov_user_md_v1(struct lov_user_md_v1 *lum) { ENTRY; @@ -2003,6 +2161,7 @@ void lustre_swab_lov_user_md_v1(struct lov_user_md_v1 *lum) lustre_swab_lov_user_md_common(lum); EXIT; } +EXPORT_SYMBOL(lustre_swab_lov_user_md_v1); void lustre_swab_lov_user_md_v3(struct lov_user_md_v3 *lum) { @@ -2012,6 +2171,7 @@ void lustre_swab_lov_user_md_v3(struct lov_user_md_v3 *lum) /* lmm_pool_name nothing to do with char */ EXIT; } +EXPORT_SYMBOL(lustre_swab_lov_user_md_v3); void lustre_swab_lov_mds_md(struct lov_mds_md *lmm) { @@ -2020,26 +2180,13 @@ void lustre_swab_lov_mds_md(struct lov_mds_md *lmm) __swab32s(&lmm->lmm_magic); __swab32s(&lmm->lmm_pattern); __swab64s(&lmm->lmm_object_id); - __swab64s(&lmm->lmm_object_gr); + __swab64s(&lmm->lmm_object_seq); __swab32s(&lmm->lmm_stripe_size); - __swab32s(&lmm->lmm_stripe_count); - EXIT; -} - -void lustre_swab_lov_user_md_join(struct lov_user_md_join *lumj) -{ - 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); + __swab16s(&lmm->lmm_stripe_count); + __swab16s(&lmm->lmm_layout_gen); EXIT; } +EXPORT_SYMBOL(lustre_swab_lov_mds_md); void lustre_swab_lov_user_md_objects(struct lov_user_ost_data *lod, int stripe_count) @@ -2048,13 +2195,13 @@ void lustre_swab_lov_user_md_objects(struct lov_user_ost_data *lod, ENTRY; for (i = 0; i < stripe_count; i++) { __swab64s(&(lod[i].l_object_id)); - __swab64s(&(lod[i].l_object_gr)); + __swab64s(&(lod[i].l_object_seq)); __swab32s(&(lod[i].l_ost_gen)); __swab32s(&(lod[i].l_ost_idx)); } EXIT; } - +EXPORT_SYMBOL(lustre_swab_lov_user_md_objects); void lustre_swab_ldlm_res_id (struct ldlm_res_id *id) { @@ -2063,8 +2210,9 @@ void lustre_swab_ldlm_res_id (struct ldlm_res_id *id) for (i = 0; i < RES_NAME_SIZE; i++) __swab64s (&id->name[i]); } +EXPORT_SYMBOL(lustre_swab_ldlm_res_id); -void lustre_swab_ldlm_policy_data (ldlm_policy_data_t *d) +void lustre_swab_ldlm_policy_data (ldlm_wire_policy_data_t *d) { /* 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 @@ -2072,13 +2220,16 @@ void lustre_swab_ldlm_policy_data (ldlm_policy_data_t *d) __swab64s(&d->l_extent.start); __swab64s(&d->l_extent.end); __swab64s(&d->l_extent.gid); - __swab32s(&d->l_flock.pid); + __swab64s(&d->l_flock.lfw_owner); + __swab32s(&d->l_flock.lfw_pid); } +EXPORT_SYMBOL(lustre_swab_ldlm_policy_data); void lustre_swab_ldlm_intent (struct ldlm_intent *i) { __swab64s (&i->opc); } +EXPORT_SYMBOL(lustre_swab_ldlm_intent); void lustre_swab_ldlm_resource_desc (struct ldlm_resource_desc *r) { @@ -2086,6 +2237,7 @@ void lustre_swab_ldlm_resource_desc (struct ldlm_resource_desc *r) CLASSERT(offsetof(typeof(*r), lr_padding) != 0); lustre_swab_ldlm_res_id (&r->lr_name); } +EXPORT_SYMBOL(lustre_swab_ldlm_resource_desc); void lustre_swab_ldlm_lock_desc (struct ldlm_lock_desc *l) { @@ -2094,6 +2246,7 @@ void lustre_swab_ldlm_lock_desc (struct ldlm_lock_desc *l) __swab32s (&l->l_granted_mode); lustre_swab_ldlm_policy_data (&l->l_policy_data); } +EXPORT_SYMBOL(lustre_swab_ldlm_lock_desc); void lustre_swab_ldlm_request (struct ldlm_request *rq) { @@ -2102,6 +2255,7 @@ void lustre_swab_ldlm_request (struct ldlm_request *rq) __swab32s (&rq->lock_count); /* lock_handle[] opaque */ } +EXPORT_SYMBOL(lustre_swab_ldlm_request); void lustre_swab_ldlm_reply (struct ldlm_reply *r) { @@ -2112,6 +2266,7 @@ void lustre_swab_ldlm_reply (struct ldlm_reply *r) __swab64s (&r->lock_policy_res1); __swab64s (&r->lock_policy_res2); } +EXPORT_SYMBOL(lustre_swab_ldlm_reply); /* no one calls this */ int llog_log_swabbed(struct llog_log_hdr *hdr) @@ -2123,81 +2278,110 @@ int llog_log_swabbed(struct llog_log_hdr *hdr) return -1; } -void lustre_swab_qdata(struct qunit_data *d) -{ - __swab32s (&d->qd_id); - __swab32s (&d->qd_flags); - __swab64s (&d->qd_count); - __swab64s (&d->qd_qunit); - __swab64s (&d->padding); -} - -#ifdef __KERNEL__ - -/** - * got qdata from request(req/rep) - */ -struct qunit_data *quota_get_qdata(void *request, int is_req, int is_exp) -{ - struct ptlrpc_request *req = (struct ptlrpc_request *)request; - struct qunit_data *qdata; - __u64 flags = is_exp ? req->rq_export->exp_connect_flags : - req->rq_import->imp_connect_data.ocd_connect_flags; - - LASSERT(req); - /* support for quota64 */ - LASSERT(flags & OBD_CONNECT_QUOTA64); - /* support for change_qs */ - LASSERT(flags & OBD_CONNECT_CHANGE_QS); - - if (is_req == QUOTA_REQUEST) - qdata = lustre_swab_reqbuf(req, REQ_REC_OFF, - sizeof(struct qunit_data), - lustre_swab_qdata); - else - qdata = lustre_swab_repbuf(req, REPLY_REC_OFF, - sizeof(struct qunit_data), - lustre_swab_qdata); - if (qdata == NULL) - return ERR_PTR(-EPROTO); - - QDATA_SET_CHANGE_QS(qdata); - return qdata; -} -EXPORT_SYMBOL(quota_get_qdata); - -/** - * copy qdata to request(req/rep) - */ -int quota_copy_qdata(void *request, struct qunit_data *qdata, - int is_req, int is_exp) -{ - struct ptlrpc_request *req = (struct ptlrpc_request *)request; - void *target; - __u64 flags = is_exp ? req->rq_export->exp_connect_flags : - req->rq_import->imp_connect_data.ocd_connect_flags; - - LASSERT(req); - LASSERT(qdata); - /* support for quota64 */ - LASSERT(flags & OBD_CONNECT_QUOTA64); - /* support for change_qs */ - LASSERT(flags & OBD_CONNECT_CHANGE_QS); - - if (is_req == QUOTA_REQUEST) - target = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, - sizeof(struct qunit_data)); - else - target = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, - sizeof(struct qunit_data)); - if (target == NULL) - return -EPROTO; - - memcpy(target, qdata, sizeof(*qdata)); - return 0; -} -EXPORT_SYMBOL(quota_copy_qdata); -#endif /* __KERNEL__ */ +void lustre_swab_quota_body(struct quota_body *b) +{ + lustre_swab_lu_fid(&b->qb_fid); + lustre_swab_lu_fid((struct lu_fid *)&b->qb_id); + __swab32s(&b->qb_flags); + __swab64s(&b->qb_count); + __swab64s(&b->qb_usage); + __swab64s(&b->qb_slv_ver); +} + +/* Dump functions */ +void dump_ioo(struct obd_ioobj *ioo) +{ + CDEBUG(D_RPCTRACE, + "obd_ioobj: ioo_id="LPD64", ioo_seq="LPD64", ioo_type=%d, " + "ioo_bufct=%d\n", ioo->ioo_id, ioo->ioo_seq, ioo->ioo_type, + ioo->ioo_bufcnt); +} +EXPORT_SYMBOL(dump_ioo); + +void dump_rniobuf(struct niobuf_remote *nb) +{ + CDEBUG(D_RPCTRACE, "niobuf_remote: offset="LPU64", len=%d, flags=%x\n", + nb->offset, nb->len, nb->flags); +} +EXPORT_SYMBOL(dump_rniobuf); + +void dump_obdo(struct obdo *oa) +{ + __u32 valid = oa->o_valid; + + CDEBUG(D_RPCTRACE, "obdo: o_valid = %08x\n", valid); + if (valid & OBD_MD_FLID) + CDEBUG(D_RPCTRACE, "obdo: o_id = "LPD64"\n", oa->o_id); + if (valid & OBD_MD_FLGROUP) + CDEBUG(D_RPCTRACE, "obdo: o_seq = "LPD64"\n", oa->o_seq); + if (valid & OBD_MD_FLFID) + CDEBUG(D_RPCTRACE, "obdo: o_parent_seq = "LPX64"\n", + oa->o_parent_seq); + if (valid & OBD_MD_FLSIZE) + CDEBUG(D_RPCTRACE, "obdo: o_size = "LPD64"\n", oa->o_size); + if (valid & OBD_MD_FLMTIME) + CDEBUG(D_RPCTRACE, "obdo: o_mtime = "LPD64"\n", oa->o_mtime); + if (valid & OBD_MD_FLATIME) + CDEBUG(D_RPCTRACE, "obdo: o_atime = "LPD64"\n", oa->o_atime); + if (valid & OBD_MD_FLCTIME) + CDEBUG(D_RPCTRACE, "obdo: o_ctime = "LPD64"\n", oa->o_ctime); + if (valid & OBD_MD_FLBLOCKS) /* allocation of space */ + CDEBUG(D_RPCTRACE, "obdo: o_blocks = "LPD64"\n", oa->o_blocks); + if (valid & OBD_MD_FLGRANT) + CDEBUG(D_RPCTRACE, "obdo: o_grant = "LPD64"\n", oa->o_grant); + if (valid & OBD_MD_FLBLKSZ) + CDEBUG(D_RPCTRACE, "obdo: o_blksize = %d\n", oa->o_blksize); + if (valid & (OBD_MD_FLTYPE | OBD_MD_FLMODE)) + CDEBUG(D_RPCTRACE, "obdo: o_mode = %o\n", + oa->o_mode & ((valid & OBD_MD_FLTYPE ? S_IFMT : 0) | + (valid & OBD_MD_FLMODE ? ~S_IFMT : 0))); + if (valid & OBD_MD_FLUID) + CDEBUG(D_RPCTRACE, "obdo: o_uid = %u\n", oa->o_uid); + if (valid & OBD_MD_FLUID) + CDEBUG(D_RPCTRACE, "obdo: o_uid_h = %u\n", oa->o_uid_h); + if (valid & OBD_MD_FLGID) + CDEBUG(D_RPCTRACE, "obdo: o_gid = %u\n", oa->o_gid); + if (valid & OBD_MD_FLGID) + CDEBUG(D_RPCTRACE, "obdo: o_gid_h = %u\n", oa->o_gid_h); + if (valid & OBD_MD_FLFLAGS) + CDEBUG(D_RPCTRACE, "obdo: o_flags = %x\n", oa->o_flags); + if (valid & OBD_MD_FLNLINK) + CDEBUG(D_RPCTRACE, "obdo: o_nlink = %u\n", oa->o_nlink); + else if (valid & OBD_MD_FLCKSUM) + CDEBUG(D_RPCTRACE, "obdo: o_checksum (o_nlink) = %u\n", + oa->o_nlink); + if (valid & OBD_MD_FLGENER) + CDEBUG(D_RPCTRACE, "obdo: o_parent_oid = %x\n", + oa->o_parent_oid); + if (valid & OBD_MD_FLEPOCH) + CDEBUG(D_RPCTRACE, "obdo: o_ioepoch = "LPD64"\n", + oa->o_ioepoch); + if (valid & OBD_MD_FLFID) { + CDEBUG(D_RPCTRACE, "obdo: o_stripe_idx = %u\n", + oa->o_stripe_idx); + CDEBUG(D_RPCTRACE, "obdo: o_parent_ver = %x\n", + oa->o_parent_ver); + } + if (valid & OBD_MD_FLHANDLE) + CDEBUG(D_RPCTRACE, "obdo: o_handle = "LPD64"\n", + oa->o_handle.cookie); + if (valid & OBD_MD_FLCOOKIE) + CDEBUG(D_RPCTRACE, "obdo: o_lcookie = " + "(llog_cookie dumping not yet implemented)\n"); +} +EXPORT_SYMBOL(dump_obdo); + +void dump_ost_body(struct ost_body *ob) +{ + dump_obdo(&ob->oa); +} +EXPORT_SYMBOL(dump_ost_body); + +void dump_rcs(__u32 *rc) +{ + CDEBUG(D_RPCTRACE, "rmf_rcs: %d\n", *rc); +} +EXPORT_SYMBOL(dump_rcs); static inline int req_ptlrpc_body_swabbed(struct ptlrpc_request *req) { @@ -2205,7 +2389,6 @@ static inline int req_ptlrpc_body_swabbed(struct ptlrpc_request *req) switch (req->rq_reqmsg->lm_magic) { 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", @@ -2220,7 +2403,6 @@ static inline int rep_ptlrpc_body_swabbed(struct ptlrpc_request *req) switch (req->rq_repmsg->lm_magic) { case LUSTRE_MSG_MAGIC_V2: - case LUSTRE_MSG_MAGIC_V2_SWABBED: return lustre_rep_swabbed(req, MSG_PTLRPC_BODY_OFF); default: /* uninitialized yet */ @@ -2228,38 +2410,49 @@ static inline int rep_ptlrpc_body_swabbed(struct ptlrpc_request *req) } } -void _debug_req(struct ptlrpc_request *req, __u32 mask, - struct libcfs_debug_msg_data *data, const char *fmt, ... ) +void _debug_req(struct ptlrpc_request *req, + struct libcfs_debug_msg_data *msgdata, + const char *fmt, ... ) { + int req_ok = req->rq_reqmsg != NULL; + int rep_ok = req->rq_repmsg != NULL; + lnet_nid_t nid = LNET_NID_ANY; va_list args; + if (ptlrpc_req_need_swab(req)) { + req_ok = req_ok && req_ptlrpc_body_swabbed(req); + rep_ok = rep_ok && rep_ptlrpc_body_swabbed(req); + } + + if (req->rq_import && req->rq_import->imp_connection) + nid = req->rq_import->imp_connection->c_peer.nid; + else if (req->rq_export && req->rq_export->exp_connection) + nid = req->rq_export->exp_connection->c_peer.nid; + 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, + libcfs_debug_vmsg2(msgdata, fmt, args, " req@%p x"LPU64"/t"LPD64"("LPD64") o%d->%s@%s:%d/%d" " lens %d/%d e %d to %d dl "CFS_TIME_T" 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_transno(req->rq_reqmsg) : 0, - 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_ok ? lustre_msg_get_transno(req->rq_reqmsg) : 0, + req_ok ? lustre_msg_get_opc(req->rq_reqmsg) : -1, 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->imp_obd->obd_name : + req->rq_export ? + req->rq_export->exp_client_uuid.uuid : + "", + libcfs_nid2str(nid), req->rq_request_portal, req->rq_reply_portal, req->rq_reqlen, req->rq_replen, - req->rq_early_count, !!req->rq_timeout, req->rq_deadline, - atomic_read(&req->rq_refcount), DEBUG_REQ_FLAGS(req), - req->rq_reqmsg && req_ptlrpc_body_swabbed(req) ? - lustre_msg_get_flags(req->rq_reqmsg) : -1, - req->rq_repmsg && rep_ptlrpc_body_swabbed(req) ? - lustre_msg_get_flags(req->rq_repmsg) : -1, + req->rq_early_count, req->rq_timedout, + req->rq_deadline, + cfs_atomic_read(&req->rq_refcount), + DEBUG_REQ_FLAGS(req), + req_ok ? lustre_msg_get_flags(req->rq_reqmsg) : -1, + rep_ok ? lustre_msg_get_flags(req->rq_repmsg) : -1, req->rq_status, - req->rq_repmsg && rep_ptlrpc_body_swabbed(req) ? - lustre_msg_get_status(req->rq_repmsg) : -1); + rep_ok ? lustre_msg_get_status(req->rq_repmsg) : -1); } EXPORT_SYMBOL(_debug_req); @@ -2274,20 +2467,98 @@ void lustre_swab_lustre_capa(struct lustre_capa *c) __swab32s (&c->lc_timeout); __swab32s (&c->lc_expiry); } +EXPORT_SYMBOL(lustre_swab_lustre_capa); void lustre_swab_lustre_capa_key(struct lustre_capa_key *k) { - __swab64s (&k->lk_mdsid); + __swab64s (&k->lk_seq); __swab32s (&k->lk_keyid); - __swab32s (&k->lk_padding); + CLASSERT(offsetof(typeof(*k), lk_padding) != 0); +} +EXPORT_SYMBOL(lustre_swab_lustre_capa_key); + +void lustre_swab_hsm_user_state(struct hsm_user_state *state) +{ + __swab32s(&state->hus_states); + __swab32s(&state->hus_archive_id); +} +EXPORT_SYMBOL(lustre_swab_hsm_user_state); + +void lustre_swab_hsm_state_set(struct hsm_state_set *hss) +{ + __swab32s(&hss->hss_valid); + __swab64s(&hss->hss_setmask); + __swab64s(&hss->hss_clearmask); + __swab32s(&hss->hss_archive_id); +} +EXPORT_SYMBOL(lustre_swab_hsm_state_set); + +void lustre_swab_hsm_extent(struct hsm_extent *extent) +{ + __swab64s(&extent->offset); + __swab64s(&extent->length); +} + +void lustre_swab_hsm_current_action(struct hsm_current_action *action) +{ + __swab32s(&action->hca_state); + __swab32s(&action->hca_action); + lustre_swab_hsm_extent(&action->hca_location); } +EXPORT_SYMBOL(lustre_swab_hsm_current_action); -void lustre_swab_lnlh(struct lnl_hdr *l) +void lustre_swab_hsm_user_item(struct hsm_user_item *hui) { - __swab16s(&l->lnl_magic); - /* __u8 l->lnl_transport */ - __swab16s(&l->lnl_msgtype); - __swab16s(&l->lnl_msglen); + lustre_swab_lu_fid(&hui->hui_fid); + lustre_swab_hsm_extent(&hui->hui_extent); +} +EXPORT_SYMBOL(lustre_swab_hsm_user_item); + +void lustre_swab_layout_intent(struct layout_intent *li) +{ + __swab32s(&li->li_opc); + __swab32s(&li->li_flags); + __swab64s(&li->li_start); + __swab64s(&li->li_end); +} +EXPORT_SYMBOL(lustre_swab_layout_intent); + +void lustre_swab_hsm_progress_kernel(struct hsm_progress_kernel *hpk) +{ + lustre_swab_lu_fid(&hpk->hpk_fid); + __swab64s(&hpk->hpk_cookie); + __swab64s(&hpk->hpk_extent.offset); + __swab64s(&hpk->hpk_extent.length); + __swab16s(&hpk->hpk_flags); + __swab16s(&hpk->hpk_errval); +} +EXPORT_SYMBOL(lustre_swab_hsm_progress_kernel); + +void lustre_swab_hsm_request(struct hsm_request *hr) +{ + __swab32s(&hr->hr_action); + __swab32s(&hr->hr_archive_id); + __swab64s(&hr->hr_flags); + __swab32s(&hr->hr_itemcount); + __swab32s(&hr->hr_data_len); +} +EXPORT_SYMBOL(lustre_swab_hsm_request); + +void lustre_swab_update_buf(struct update_buf *ub) +{ + __swab32s(&ub->ub_magic); + __swab32s(&ub->ub_count); +} +EXPORT_SYMBOL(lustre_swab_update_buf); + +void lustre_swab_update_reply_buf(struct update_reply *ur) +{ + int i; + + __swab32s(&ur->ur_version); + __swab32s(&ur->ur_count); + for (i = 0; i < ur->ur_count; i++) + __swab32s(&ur->ur_lens[i]); } -EXPORT_SYMBOL(lustre_swab_lnlh); +EXPORT_SYMBOL(lustre_swab_update_reply_buf);